Revert "[#3592] Use the currentBase stored in preference at onResume (#…

…3594)" This reverts commit 583c415.
Oztechan · Jun 30, 2024 · e9174c9 · e9174c9
1 parent a623fb4
commit e9174c9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt b/...c/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
@@ -62,7 +62,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
         super.onResume()
         Logger.i { "CalculatorFragment onResume" }
         analyticsManager.trackScreen(ScreenName.Calculator)
-        calculatorViewModel.event.onBaseChange(null)
     }
 
     override fun onDestroy() {

diff --git a/...ator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt b/...ator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt
@@ -32,7 +32,7 @@ interface CalculatorEvent : BaseEvent {
     fun onPasteToInput(text: String)
     fun onBarClick()
     fun onSettingsClicked()
-    fun onBaseChange(base: String?)
+    fun onBaseChange(base: String)
 }
 
 // Effect

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
@@ -300,10 +300,9 @@ class CalculatorViewModel(
         _effect.emit(CalculatorEffect.OpenSettings)
     }
 
-    override fun onBaseChange(base: String?) {
+    override fun onBaseChange(base: String) {
         Logger.d { "CalculatorViewModel onBaseChange $base" }
-        val newBase = base ?: calculationStorage.currentBase
-        currentBaseChanged(newBase)
+        currentBaseChanged(base)
         calculateOutput(_state.value.input)
     }
     // endregion

diff --git a/...commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt b/...commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt
@@ -303,28 +303,6 @@ internal class CalculatorViewModelTest {
         }
     }
 
-    @Test
-    fun `when app resumes it calls onBaseChange with null and it sets the base according to the preference`() =
-        runTest {
-            every { calculationStorage.currentBase }
-                .returns(currency1.code)
-
-            everySuspend { backendApiService.getConversion(currency1.code) }
-                .returns(conversion)
-
-            viewModel.state.onSubscription {
-                viewModel.event.onBaseChange(null)
-            }.firstOrNull().let {
-                assertNotNull(it)
-                assertNotNull(viewModel.data.conversion)
-                assertEquals(currency1.code, viewModel.data.conversion!!.base)
-                assertEquals(currency1.code, it.base)
-
-                verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency1.code))) }
-                verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency1.code)) }
-            }
-        }
-
     // Event
     @Test
     fun onBarClick() = runTest {