fix(flipcash/services/opencode): remove BalanceController#balance

have rawBalance be only observable; cash and balance convert to rate for UI

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/BalanceViewModel.kt

@@ -15,12 +15,14 @@ import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.controllers.TransactionController
+import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.PublicKey
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -37,6 +39,7 @@ internal class BalanceViewModel @Inject constructor(
     featureFlags: FeatureFlagController,
     userManager: UserManager,
     resources: ResourceHelper,
+    private val exchange: Exchange,
 ) : BaseViewModel2<BalanceViewModel.State, BalanceViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent
@@ -60,9 +63,18 @@ internal class BalanceViewModel @Inject constructor(
     }
 
     init {
-        balanceController.balance
-            .onEach { dispatchEvent(Event.OnBalanceUpdated(it)) }
-            .launchIn(viewModelScope)
+        combine(
+            balanceController.rawBalance,
+            exchange.observeEntryRate(),
+        ) { balance, rate ->
+            LocalFiat(
+                usdc = balance,
+                converted = balance.convertingTo(rate),
+                rate = rate
+            )
+        }.onEach {
+            dispatchEvent(Event.OnBalanceUpdated(it))
+        }.launchIn(viewModelScope)
 
         featureFlags.observe(FeatureFlag.TransactionDetails)
             .onEach { dispatchEvent(Event.OnTransactionDetailsEnabled(it)) }

apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt

@@ -252,7 +252,6 @@ internal class CashScreenViewModel @Inject constructor(
 
     internal companion object {
         val updateStateForEvent: (Event) -> ((State) -> State) = { event ->
-            println("event: $event")
             when (event) {
                 is Event.OnBalanceChanged -> { state ->
                     state.copy(balance = event.balance)

services/opencode/src/main/kotlin/com/getcode/opencode/ControllerFactory.kt

@@ -5,9 +5,7 @@ import com.getcode.opencode.controllers.AccountController
 import com.getcode.opencode.controllers.BalanceController
 import com.getcode.opencode.controllers.MessagingController
 import com.getcode.opencode.controllers.TransactionController
-import com.getcode.opencode.generators.MnemonicGenerator
 import com.getcode.opencode.inject.OpenCodeModule
-import com.getcode.opencode.managers.MnemonicManager
 import dagger.hilt.android.EntryPointAccessors
 
 object ControllerFactory {
@@ -19,18 +17,8 @@ object ControllerFactory {
     }
 
     fun createBalanceController(context: Context,config: ProtocolConfig): BalanceController {
-        val appContext = context.applicationContext ?: throw IllegalStateException(
-            "applicationContext was not provided",
-        )
-
-        val module =  EntryPointAccessors.fromApplication(
-            appContext,
-            OpenCodeModule::class.java,
-        )
-
         return BalanceController(
             accountController = createAccountController(context, config),
-            exchange = ExchangeFactory.createOpenCodeExchange(context, config),
             networkObserver = NetworkFactory.createNetworkObserver(context),
         )
     }

services/opencode/src/main/kotlin/com/getcode/opencode/controllers/BalanceController.kt

@@ -1,6 +1,5 @@
 package com.getcode.opencode.controllers
 
-import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.model.accounts.AccountCluster
 import com.getcode.opencode.model.accounts.AccountInfo
 import com.getcode.opencode.model.accounts.AccountType
@@ -16,18 +15,14 @@ import com.getcode.utils.network.NetworkConnectivityListener
 import com.getcode.utils.network.retryable
 import com.getcode.utils.timedTrace
 import com.getcode.utils.trace
-import com.hoc081098.channeleventbus.ChannelEventBus
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -42,12 +37,11 @@ import kotlin.concurrent.atomics.ExperimentalAtomicApi
 class BalanceController @Inject constructor(
     private val accountController: AccountController,
     private val networkObserver: NetworkConnectivityListener,
-    private val exchange: Exchange,
 ) {
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
     private val _rawBalance = MutableStateFlow(Fiat.Zero)
-    private val localizedBalance = MutableStateFlow(LocalFiat.Zero)
+
     private val cluster = MutableStateFlow<AccountCluster?>(null)
 
     private val fetching = AtomicBoolean(false)
@@ -58,9 +52,6 @@ class BalanceController @Inject constructor(
     val rawBalance: StateFlow<Fiat>
         get() = _rawBalance.asStateFlow()
 
-    val balance: StateFlow<LocalFiat>
-        get() = localizedBalance.asStateFlow()
-
     fun onUserLoggedIn(cluster: AccountCluster) {
         trace(
             tag = "Balance",
@@ -78,22 +69,6 @@ class BalanceController @Inject constructor(
                 if (connected) {
                     retryable { fetchBalance() }
                 }
-            }.flatMapLatest {
-                combine(
-                    exchange.observeBalanceRate()
-                        .flowOn(Dispatchers.IO)
-                        .onEach { exchange.fetchRatesIfNeeded() },
-                    _rawBalance
-                ) { rate, balance ->
-                    LocalFiat(
-                        usdc = balance,
-                        converted = balance.convertingTo(rate),
-                        rate = rate
-                    )
-                }
-            }.distinctUntilChanged()
-            .onEach { newBalance ->
-                localizedBalance.update { newBalance }
             }.launchIn(scope)
     }
 
@@ -104,7 +79,6 @@ class BalanceController @Inject constructor(
         } else {
             _rawBalance.value += fiat.usdc
         }
-        localizedBalance.value = fiat
     }
 
     suspend fun subtract(fiat: LocalFiat) {
@@ -114,7 +88,6 @@ class BalanceController @Inject constructor(
         } else {
             _rawBalance.value = (_rawBalance.value - fiat.usdc).coerceAtLeast(Fiat.Zero)
         }
-        localizedBalance.value = fiat
     }
 
     // TODO: split non-balance account handling out into a separate controller
@@ -155,7 +128,8 @@ class BalanceController @Inject constructor(
                     throw error
                 }
             }?.map { response ->
-                val primary = response.accounts.values.find { it.accountType == AccountType.Primary }
+                val primary =
+                    response.accounts.values.find { it.accountType == AccountType.Primary }
                 if (primary?.unusable == true) {
                     onTimelockUnlocked()
                 }
@@ -194,7 +168,6 @@ class BalanceController @Inject constructor(
 
     fun reset() {
         _rawBalance.value = Fiat.Zero
-        localizedBalance.value = LocalFiat.Zero
         cluster.value = null
     }
 }