Fix updating sorting type in BalanceViewModel

horizontalsystems · Jun 4, 2024 · 22ee681 · 22ee681
1 parent 16afc95
commit 22ee681
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt
@@ -56,9 +56,9 @@ class BalanceViewModel(
     private var errorMessage: String? = null
     private var balanceTabButtonsEnabled = localStorage.balanceTabButtonsEnabled
 
-    val sortTypes =
+    private val sortTypes =
         listOf(BalanceSortType.Value, BalanceSortType.Name, BalanceSortType.PercentGrowth)
-    var sortType by service::sortType
+    private var sortType = service.sortType
 
     var connectionResult by mutableStateOf<WalletConnectListViewModel.ConnectionResult?>(null)
         private set
@@ -118,7 +118,9 @@ class BalanceViewModel(
         headerNote = headerNote(),
         errorMessage = errorMessage,
         openSend = openSendTokenSelect,
-        balanceTabButtonsEnabled = balanceTabButtonsEnabled
+        balanceTabButtonsEnabled = balanceTabButtonsEnabled,
+        sortType = sortType,
+        sortTypes = sortTypes,
     )
 
     private suspend fun handleUpdatedBalanceViewType(balanceViewType: BalanceViewType) {
@@ -192,6 +194,15 @@ class BalanceViewModel(
         }
     }
 
+    fun setSortType(sortType: BalanceSortType) {
+        this.sortType = sortType
+        emitState()
+
+        viewModelScope.launch(Dispatchers.Default) {
+            service.sortType = sortType
+        }
+    }
+
     fun onCloseHeaderNote(headerNote: HeaderNote) {
         when (headerNote) {
             HeaderNote.NonRecommendedAccount -> {
@@ -347,6 +358,8 @@ data class BalanceUiState(
     val errorMessage: String?,
     val openSend: OpenSendTokenSelect? = null,
     val balanceTabButtonsEnabled: Boolean,
+    val sortType: BalanceSortType,
+    val sortTypes: List<BalanceSortType>,
 )
 
 data class OpenSendTokenSelect(

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/ui/BalanceItems.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/ui/BalanceItems.kt
@@ -233,7 +233,7 @@ fun BalanceItems(
             modifier = Modifier.fillMaxSize(),
             state = rememberSaveable(
                 accountViewItem.id,
-                viewModel.sortType,
+                uiState.sortType,
                 saver = LazyListState.Saver
             ) {
                 LazyListState()
@@ -331,10 +331,10 @@ fun BalanceItems(
             stickyHeader {
                 HeaderSorting {
                     BalanceSortingSelector(
-                        sortType = viewModel.sortType,
-                        sortTypes = viewModel.sortTypes
+                        sortType = uiState.sortType,
+                        sortTypes = uiState.sortTypes
                     ) {
-                        viewModel.sortType = it
+                        viewModel.setSortType(it)
                     }
 
                     Spacer(modifier = Modifier.weight(1f))