From 42ec9161156e978c015a3c96153c1bcdeecb1cc2 Mon Sep 17 00:00:00 2001 From: chyngyz Date: Tue, 27 Jun 2023 15:34:15 +0600 Subject: [PATCH] Fix bug in Balance Auto Hide - coming from background not hiding balance items --- .../modules/balance/BalanceViewModel.kt | 17 ++++++----------- .../bankwallet/modules/balance/TotalBalance.kt | 5 +++++ 2 files changed, 11 insertions(+), 11 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 index 6b053a0a718..8db6637cf49 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewModel.kt @@ -59,6 +59,12 @@ class BalanceViewModel( } } + viewModelScope.launch { + totalBalance.stateFlow.collect { + refreshViewItems(service.balanceItemsFlow.value) + } + } + viewModelScope.launch { balanceViewTypeManager.balanceViewTypeFlow.collect { handleUpdatedBalanceViewType(it) @@ -126,17 +132,6 @@ class BalanceViewModel( service.clear() } - override fun toggleBalanceVisibility() { - totalBalance.toggleBalanceVisibility() - viewModelScope.launch { - service.balanceItemsFlow.value?.let { refreshViewItems(it) } - } - } - - override fun toggleTotalType() { - totalBalance.toggleTotalType() - } - fun onItem(viewItem: BalanceViewItem) { viewModelScope.launch { expandedWallet = when { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/TotalBalance.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/TotalBalance.kt index dcc28dd99c7..4ed80c0d08a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/TotalBalance.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/TotalBalance.kt @@ -6,12 +6,14 @@ import androidx.compose.runtime.setValue import io.horizontalsystems.bankwallet.core.App import io.horizontalsystems.bankwallet.core.managers.BalanceHiddenManager import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch interface ITotalBalance { val balanceHidden: Boolean val totalUiState: TotalUIState + val stateFlow: StateFlow fun toggleBalanceVisibility() fun toggleTotalType() @@ -29,6 +31,9 @@ class TotalBalance( override var totalUiState by mutableStateOf(createTotalUIState()) private set + override val stateFlow: StateFlow + get() = totalService.stateFlow + fun start(viewModelScope: CoroutineScope) { viewModelScope.launch { totalService.stateFlow.collect {