chore: rename BaseViewModel2 to BaseViewModel

bmc08gt · claude · bmc08gt · commit 40effab4050f · 2026-05-19T10:40:52.000-04:00
Now that the deprecated BaseViewModel is gone, rename
BaseViewModel2 back to BaseViewModel across all 20+ ViewModels
and update agent references.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.claude/agents/module-scaffolder.md b/.claude/agents/module-scaffolder.md
@@ -117,14 +117,14 @@ fun <Name>Screen() {
 package com.flipcash.app.<name>.internal
 
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 internal class <Name>ViewModel @Inject constructor(
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<<Name>ViewModel.State, <Name>ViewModel.Event>(
+) : BaseViewModel<<Name>ViewModel.State, <Name>ViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/.claude/agents/test-gap-finder.md b/.claude/agents/test-gap-finder.md
@@ -39,7 +39,7 @@ class <Name>ViewModelTest {
     @get:Rule val mainCoroutineRule = MainCoroutineRule()
 
     // Dependencies as mockk(relaxed = true)
-    // VMs extend BaseViewModel2<State, Event> with a companion `updateStateForEvent` reducer
+    // VMs extend BaseViewModel<State, Event> with a companion `updateStateForEvent` reducer
     // Test the pure updateStateForEvent reducer function directly when possible
     // For integration: create VM, dispatch events, advanceUntilIdle(), assert stateFlow value
 }
diff --git a/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeaturesScreenViewModel.kt b/apps/flipcash/features/advanced/src/main/kotlin/com/flipcash/app/advanced/internal/AdvancedFeaturesScreenViewModel.kt
@@ -7,7 +7,7 @@ import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.menu.MenuItem
 import com.flipcash.app.userflags.UserFlagsCoordinator
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
@@ -25,7 +25,7 @@ internal class AdvancedFeaturesScreenViewModel @Inject constructor(
     featureFlagController: FeatureFlagController,
     userFlags: UserFlagsCoordinator,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<AdvancedFeaturesScreenViewModel.State, AdvancedFeaturesScreenViewModel.Event>(
+) : BaseViewModel<AdvancedFeaturesScreenViewModel.State, AdvancedFeaturesScreenViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceViewModel.kt b/apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceViewModel.kt
@@ -7,7 +7,7 @@ import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
@@ -23,7 +23,7 @@ internal class BalanceViewModel @Inject constructor(
     userManager: UserManager,
     userFlags: UserFlagsCoordinator,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<BalanceViewModel.State, BalanceViewModel.Event>(
+) : BaseViewModel<BalanceViewModel.State, BalanceViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt b/apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt
@@ -26,7 +26,7 @@ import com.getcode.solana.keys.Mint
 import com.getcode.ui.components.text.AmountAnimatedInputUiModel
 import com.getcode.ui.components.text.NumberInputHelper
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CompletableDeferred
@@ -54,7 +54,7 @@ internal class CashScreenViewModel @Inject constructor(
     tokenCoordinator: TokenCoordinator,
     transactionController: TransactionOperations,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<CashScreenViewModel.State, CashScreenViewModel.Event>(
+) : BaseViewModel<CashScreenViewModel.State, CashScreenViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/email/EmailVerificationViewModel.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/email/EmailVerificationViewModel.kt
@@ -19,7 +19,7 @@ import com.getcode.manager.BottomBarManager
 import com.getcode.manager.BottomBarManager.BottomBarButtonStyle
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +45,7 @@ class EmailVerificationViewModel @Inject constructor(
     private val resources: ResourceHelper,
     private val dispatchers: DispatcherProvider,
     private val emailCodeChannel: EmailCodeChannel,
-) : BaseViewModel2<EmailVerificationViewModel.State, EmailVerificationViewModel.Event>(
+) : BaseViewModel<EmailVerificationViewModel.State, EmailVerificationViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/phone/PhoneVerificationViewModel.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/phone/PhoneVerificationViewModel.kt
@@ -14,7 +14,7 @@ import com.flipcash.services.models.ContactMethod
 import com.flipcash.services.models.PhoneVerificationError
 import com.getcode.manager.BottomBarManager
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
@@ -39,7 +39,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
     private val profileController: ProfileController,
     private val resources: ResourceHelper,
     private val dispatchers: DispatcherProvider,
-) : BaseViewModel2<PhoneVerificationViewModel.State, PhoneVerificationViewModel.Event>(
+) : BaseViewModel<PhoneVerificationViewModel.State, PhoneVerificationViewModel.Event>(
     initialState = State(selectedLocale = phoneUtils.defaultCountryLocale),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt b/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt
@@ -57,7 +57,7 @@ import com.getcode.opencode.model.ui.TokenBillCustomizations
 import com.getcode.solana.keys.Mint
 import com.getcode.util.resources.ContentReader
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.FlowPreview
@@ -98,7 +98,7 @@ internal class CurrencyCreatorViewModel @Inject constructor(
     val contentReader: ContentReader,
     val purchaseMethodController: PurchaseMethodController,
     private val currencyCreatorCoordinator: CurrencyCreatorCoordinator,
-) : BaseViewModel2<CurrencyCreatorViewModel.State, CurrencyCreatorViewModel.Event>(
+) : BaseViewModel<CurrencyCreatorViewModel.State, CurrencyCreatorViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/internal/DepositViewModel.kt b/apps/flipcash/features/deposit/src/main/kotlin/com/flipcash/app/deposit/internal/DepositViewModel.kt
@@ -17,7 +17,7 @@ import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdf
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.filterIsInstance
@@ -36,7 +36,7 @@ internal class DepositViewModel @Inject constructor(
     resources: ResourceHelper,
     dispatchers: DispatcherProvider,
     featureFlags: FeatureFlagController,
-) : BaseViewModel2<DepositViewModel.State, DepositViewModel.Event>(
+) : BaseViewModel<DepositViewModel.State, DepositViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/device-logs/src/main/kotlin/com/flipcash/app/devicelogs/internal/DeviceLogsScreenViewModel.kt b/apps/flipcash/features/device-logs/src/main/kotlin/com/flipcash/app/devicelogs/internal/DeviceLogsScreenViewModel.kt
@@ -3,7 +3,7 @@ package com.flipcash.app.devicelogs.internal
 import androidx.lifecycle.viewModelScope
 import com.flipcash.libs.coroutines.DispatcherProvider
 import com.getcode.utils.TraceManager
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -13,7 +13,7 @@ import javax.inject.Inject
 @HiltViewModel
 internal class DeviceLogsScreenViewModel @Inject constructor(
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<DeviceLogsScreenViewModel.State, DeviceLogsScreenViewModel.Event>(
+) : BaseViewModel<DeviceLogsScreenViewModel.State, DeviceLogsScreenViewModel.Event>(
     // Subscribing to the SharedFlow replay cache below seeds history naturally —
     // new collectors receive the last N lines as emissions.
     initialState = State(),
diff --git a/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/TokenDiscoveryViewModel.kt b/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/TokenDiscoveryViewModel.kt
@@ -12,7 +12,7 @@ import com.getcode.opencode.model.ui.DiscoverCategory
 import com.getcode.solana.keys.Mint
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.filterIsInstance
@@ -28,7 +28,7 @@ internal class TokenDiscoveryViewModel @Inject constructor(
     private val resources: ResourceHelper,
     featureFlags: FeatureFlagController,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<TokenDiscoveryViewModel.State, TokenDiscoveryViewModel.Event>(
+) : BaseViewModel<TokenDiscoveryViewModel.State, TokenDiscoveryViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginViewModel.kt b/apps/flipcash/features/login/src/main/kotlin/com/flipcash/app/login/router/LoginViewModel.kt
@@ -10,7 +10,7 @@ import com.getcode.manager.BottomBarManager
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.encodeBase64
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filter
@@ -30,7 +30,7 @@ class LoginViewModel @Inject constructor(
     private val resources: ResourceHelper,
     private val analytics: FlipcashAnalyticsService,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<LoginViewModel.State, LoginViewModel.Event>(
+) : BaseViewModel<LoginViewModel.State, LoginViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt b/apps/flipcash/features/menu/src/main/kotlin/com/flipcash/app/menu/internal/MenuScreenViewModel.kt
@@ -20,7 +20,7 @@ import com.getcode.opencode.managers.MnemonicManager
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
 import com.getcode.manager.BottomBarAction
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
@@ -55,7 +55,7 @@ internal class MenuScreenViewModel @Inject constructor(
     dispatchers: DispatcherProvider,
     releaseStageProvider: ReleaseStageProvider,
 ) :
-    BaseViewModel2<MenuScreenViewModel.State, MenuScreenViewModel.Event>(
+    BaseViewModel<MenuScreenViewModel.State, MenuScreenViewModel.Event>(
         initialState = State(),
         updateStateForEvent = updateStateForEvent,
         defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt b/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt
@@ -14,7 +14,7 @@ import com.getcode.manager.BottomBarManager
 import com.getcode.solana.keys.base58
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.base64
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.combine
@@ -43,7 +43,7 @@ internal class MyAccountScreenViewModel @Inject constructor(
     authManager: AuthManager,
     clipboardManager: ClipboardManager,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<MyAccountScreenViewModel.State, MyAccountScreenViewModel.Event>(
+) : BaseViewModel<MyAccountScreenViewModel.State, MyAccountScreenViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt b/apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt
@@ -16,7 +16,7 @@ import com.getcode.manager.BottomBarManager
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
@@ -37,7 +37,7 @@ internal class PurchaseAccountViewModel @Inject constructor(
     billingClient: BillingClient,
     resources: ResourceHelper,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<PurchaseAccountViewModel.State, PurchaseAccountViewModel.Event>(
+) : BaseViewModel<PurchaseAccountViewModel.State, PurchaseAccountViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/TransactionHistoryViewModel.kt b/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/TransactionHistoryViewModel.kt
@@ -19,7 +19,7 @@ import com.getcode.opencode.model.core.ID
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
@@ -39,7 +39,7 @@ class TransactionHistoryViewModel @Inject constructor(
     userManager: UserManager,
     resources: ResourceHelper,
     dispatchers: DispatcherProvider,
-): BaseViewModel2<TransactionHistoryViewModel.State, TransactionHistoryViewModel.Event>(
+): BaseViewModel<TransactionHistoryViewModel.State, TransactionHistoryViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/userflags/src/main/kotlin/com/flipcash/app/userflags/internal/UserFlagsViewModel.kt b/apps/flipcash/features/userflags/src/main/kotlin/com/flipcash/app/userflags/internal/UserFlagsViewModel.kt
@@ -11,7 +11,7 @@ import com.flipcash.app.userflags.UserFlagsCoordinator
 import com.flipcash.app.userflags.internal.components.FieldEditorSheet
 import com.flipcash.features.userflags.R
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
@@ -22,7 +22,7 @@ import javax.inject.Inject
 internal class UserFlagsViewModel @Inject constructor(
     flagsCoordinator: UserFlagsCoordinator,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<UserFlagsViewModel.State, UserFlagsViewModel.Event>(
+) : BaseViewModel<UserFlagsViewModel.State, UserFlagsViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt
@@ -36,7 +36,7 @@ import com.getcode.ui.components.text.NumberInputHelper
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.base58
 import com.getcode.vendor.Base58
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.coroutineScope
@@ -81,7 +81,7 @@ internal class WithdrawalViewModel @Inject constructor(
     analytics: FlipcashAnalyticsService,
     private val tokenCoordinator: TokenCoordinator,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<WithdrawalViewModel.State, WithdrawalViewModel.Event>(
+) : BaseViewModel<WithdrawalViewModel.State, WithdrawalViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/shared/currency-selection/ui/src/main/kotlin/com/flipcash/app/currency/internal/CurrencyViewModel.kt b/apps/flipcash/shared/currency-selection/ui/src/main/kotlin/com/flipcash/app/currency/internal/CurrencyViewModel.kt
@@ -10,7 +10,7 @@ import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.financial.Currency
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -29,7 +29,7 @@ class CurrencyViewModel @Inject constructor(
     preferredCurrencyController: PreferredCurrencyController,
     private val resources: ResourceHelper,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<CurrencyViewModel.State, CurrencyViewModel.Event>(
+) : BaseViewModel<CurrencyViewModel.State, CurrencyViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SelectTokenViewModel.kt
@@ -23,7 +23,7 @@ import com.getcode.opencode.model.financial.toFiat
 import com.getcode.solana.keys.Mint
 import com.getcode.util.resources.ResourceHelper
 import com.flipcash.libs.coroutines.DispatcherProvider
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -43,7 +43,7 @@ class SelectTokenViewModel @Inject constructor(
     featureFlags: FeatureFlagController,
     resources: ResourceHelper,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<SelectTokenViewModel.State, SelectTokenViewModel.Event>(
+) : BaseViewModel<SelectTokenViewModel.State, SelectTokenViewModel.Event>(
     initialState = State(purpose = TokenPurpose.Balance),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SwapViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SwapViewModel.kt
@@ -51,7 +51,7 @@ import com.getcode.ui.components.text.AmountAnimatedInputUiModel
 import com.getcode.ui.components.text.NumberInputHelper
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.trace
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
@@ -91,7 +91,7 @@ class SwapViewModel @Inject constructor(
     private val purchaseMethodController: PurchaseMethodController,
     private val coinbaseOnRampController: CoinbaseOnRampController,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<SwapViewModel.State, SwapViewModel.Event>(
+) : BaseViewModel<SwapViewModel.State, SwapViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/TokenInfoViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/TokenInfoViewModel.kt
@@ -26,7 +26,7 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.ui.WindowedRange
 import com.getcode.solana.keys.Mint
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.view.BaseViewModel2
+import com.getcode.view.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -50,7 +50,7 @@ class TokenInfoViewModel @Inject constructor(
     private val resources: ResourceHelper,
     features: FeatureFlagController,
     dispatchers: DispatcherProvider,
-) : BaseViewModel2<TokenInfoViewModel.State, TokenInfoViewModel.Event>(
+) : BaseViewModel<TokenInfoViewModel.State, TokenInfoViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
     defaultDispatcher = dispatchers.Default,
diff --git a/ui/navigation/src/main/kotlin/com/getcode/view/BaseViewModel.kt b/ui/navigation/src/main/kotlin/com/getcode/view/BaseViewModel.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 
-abstract class BaseViewModel2<ViewState : Any, Event : Any>(
+abstract class BaseViewModel<ViewState : Any, Event : Any>(
     initialState: ViewState,
     private val updateStateForEvent: (Event) -> (ViewState.() -> ViewState),
     private val defaultDispatcher: CoroutineContext = Dispatchers.Default,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class <Name>ViewModelTest {`
`39`	`39`	`@get:Rule val mainCoroutineRule = MainCoroutineRule()`
`40`	`40`
`41`	`41`	`// Dependencies as mockk(relaxed = true)`
`42`		- // VMs extend BaseViewModel2<State, Event> with a companion `updateStateForEvent` reducer
	`42`	+ // VMs extend BaseViewModel<State, Event> with a companion `updateStateForEvent` reducer
`43`	`43`	`// Test the pure updateStateForEvent reducer function directly when possible`
`44`	`44`	`// For integration: create VM, dispatch events, advanceUntilIdle(), assert stateFlow value`
`45`	`45`	`}`