Updated on 2026-08-14

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/organizetokens/model/OrganizeTokensModel.kt

@@ -11,6 +11,9 @@ import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
 import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.account.status.usecase.ApplyTokenListSortingUseCaseV2
+import com.tangem.domain.account.status.usecase.ToggleTokenListGroupingUseCaseV2
+import com.tangem.domain.account.status.usecase.ToggleTokenListSortingUseCaseV2
 import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
@@ -55,6 +58,9 @@ internal class OrganizeTokensModel @Inject constructor(
     private val accountsFeatureToggles: AccountsFeatureToggles,
     private val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase,
     private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
+    private val toggleTokenListGroupingUseCaseV2: ToggleTokenListGroupingUseCaseV2,
+    private val toggleTokenListSortingUseCaseV2: ToggleTokenListSortingUseCaseV2,
+    private val applyTokenListSortingUseCaseV2: ApplyTokenListSortingUseCaseV2,
 ) : Model(), OrganizeTokensIntents {
 
     private val selectedAppCurrencyFlow = createSelectedAppCurrencyFlow()
@@ -82,6 +88,8 @@ internal class OrganizeTokensModel @Inject constructor(
     private var cachedTokenList: TokenList? = null
     private var cachedAccountStatusList: AccountStatusList? = null
 
+    private var isAccountsModeEnabled: Boolean = false
+
     val uiState: StateFlow<OrganizeTokensState> = stateHolder.stateFlow
 
     val onBack = MutableSharedFlow<Unit>()
@@ -112,7 +120,13 @@ internal class OrganizeTokensModel @Inject constructor(
             analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.ByBalance)
 
             modelScope.launch {
-                // todo account token list sorting
+                toggleTokenListSortingUseCaseV2(list).fold(
+                    ifLeft = stateHolder::updateStateWithError,
+                    ifRight = {
+                        stateHolder.updateStateAfterTokenListSortingV2(it, isAccountsModeEnabled)
+                        cachedAccountStatusList = it
+                    },
+                )
             }
         } else {
             val list = cachedTokenList ?: return
@@ -134,10 +148,18 @@ internal class OrganizeTokensModel @Inject constructor(
 
     override fun onGroupClick() {
         if (accountsFeatureToggles.isFeatureEnabled) {
-            cachedAccountStatusList ?: return
+            val list = cachedAccountStatusList ?: return
+
             analyticsEventsHandler.send(PortfolioOrganizeTokensAnalyticsEvent.Group)
+
             modelScope.launch {
-                // todo account token list grouping
+                toggleTokenListGroupingUseCaseV2(list).fold(
+                    ifLeft = stateHolder::updateStateWithError,
+                    ifRight = {
+                        stateHolder.updateStateAfterTokenListSortingV2(it, isAccountsModeEnabled)
+                        cachedAccountStatusList = it
+                    },
+                )
             }
         } else {
             val list = cachedTokenList ?: return
@@ -172,8 +194,11 @@ internal class OrganizeTokensModel @Inject constructor(
                     isSortedByBalance = isSortedByBalance,
                 )
 
-                // val sorted = resolver.resolveV2(tokensListUM, cachedAccountStatusList)
-                TODO("Implement account token list sorting")
+                applyTokenListSortingUseCaseV2(
+                    sortedTokensIdsByAccount = resolver.resolveV2(tokensListUM, cachedAccountStatusList),
+                    isGroupedByNetwork = isGroupedByNetwork,
+                    isSortedByBalance = isSortedByBalance,
+                )
             } else {
                 val listState = uiState.value.itemsState
 
@@ -215,7 +240,7 @@ internal class OrganizeTokensModel @Inject constructor(
                     SingleAccountStatusListProducer.Params(userWalletId),
                 ) ?: return@launch
 
-                val isAccountsModeEnabled = isAccountsModeEnabledUseCase.invokeSync()
+                isAccountsModeEnabled = isAccountsModeEnabledUseCase.invokeSync()
 
                 stateHolder.updateStateWithAccountList(
                     accountStatusList = accountList,

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensStateHolder.kt

@@ -79,6 +79,18 @@ internal class OrganizeTokensStateHolder(
         }
     }
 
+    fun updateStateAfterTokenListSortingV2(accountStatusList: AccountStatusList, isAccountsModeEnabled: Boolean) {
+        updateState {
+            TokenListToStateConverterV2(
+                accountStatusList = accountStatusList,
+                isAccountsMode = isAccountsModeEnabled,
+                appCurrency = appCurrencyProvider(),
+            ).transform(this).copy(
+                scrollListToTop = triggeredEvent(Unit, ::consumeScrollListToTopEvent),
+            )
+        }
+    }
+
     fun updateStateToDisplayProgress() {
         updateState { inProgressStateConverter.convert(value = this) }
     }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/CryptoCurrenciesIdsResolver.kt

@@ -1,9 +1,13 @@
 package com.tangem.feature.wallet.presentation.organizetokens.utils
 
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.model.AccountCryptoCurrencies
+import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListState
+import com.tangem.feature.wallet.presentation.organizetokens.model.OrganizeTokensListUM
 
 internal class CryptoCurrenciesIdsResolver {
 
@@ -29,4 +33,26 @@ internal class CryptoCurrenciesIdsResolver {
             currencyStatus?.currency?.id
         }
     }
+
+    fun resolveV2(tokensListUM: OrganizeTokensListUM, accountStatusList: AccountStatusList?): AccountCryptoCurrencies {
+        val draggableTokens = when (tokensListUM) {
+            OrganizeTokensListUM.EmptyList -> return emptyMap()
+            is OrganizeTokensListUM.AccountList,
+            is OrganizeTokensListUM.TokensList,
+            -> tokensListUM.items.filterIsInstance<DraggableItem.Token>()
+        }
+
+        return accountStatusList?.accountStatuses
+            ?.filter { it.getCryptoTokenList() != TokenList.Empty }
+            ?.associate { accountStatus ->
+                val currencies = accountStatus.flattenCurrencies()
+                accountStatus.account as Account.CryptoPortfolio to draggableTokens
+                    .asSequence()
+                    .filter { it.accountId == accountStatus.account.accountId.value }
+                    .mapNotNull { sortedToken ->
+                        currencies.firstOrNull { it.currency.id.value == sortedToken.id }?.currency
+                    }
+                    .toList()
+            } ?: emptyMap()
+    }
 }