[#3933] Move loadings into beginning of observations (#3934)

Oztechan · Sep 15, 2024 · 03d1aa0 · 03d1aa0
1 parent e19dbf3
commit 03d1aa0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/...src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
@@ -81,6 +81,7 @@ class CalculatorViewModel(
     private fun observeBase() = state.map { it.base }
         .distinctUntilChanged()
         .onEach {
+            setState { copy(loading = true) }
             Logger.d { "CalculatorViewModel observeBase $it" }
             calculationStorage.currentBase = it
             currentBaseChanged(it)
@@ -91,15 +92,14 @@ class CalculatorViewModel(
     private fun observeInput() = state.map { it.input }
         .distinctUntilChanged()
         .onEach {
+            setState { copy(loading = true) }
             Logger.d { "CalculatorViewModel observeInput $it" }
             calculationStorage.lastInput = it
             calculateOutput(it)
         }
         .launchIn(viewModelScope)
 
     private fun updateConversion() {
-        setState { copy(loading = true) }
-
         data.conversion?.let {
             calculateConversions(it, ConversionState.Cached(it.date))
         } ?: viewModelScope.launch {