feat: start to replace BalanceController with multi-token controller

- Handle multiple token balances and a record of Token's (MintMetadata) for querying
- Update balance/wallet amount to show sum of tokens in header

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

Author: bmc08gt

…/core/internal/updater/BalanceUpdater.kt …pp/core/internal/updater/TokenUpdater.ktapps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/BalanceUpdater.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/TokenUpdater.kt apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/BalanceUpdater.kt renamed to apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/internal/updater/TokenUpdater.kt

@@ -1,17 +1,15 @@
 package com.flipcash.app.core.internal.updater
 
 import com.flipcash.app.core.updater.NetworkUpdater
-import com.getcode.opencode.controllers.BalanceController
+import com.getcode.opencode.controllers.TokenController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.util.Timer
 import javax.inject.Inject
 import kotlin.concurrent.fixedRateTimer
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
-class BalanceUpdater @Inject constructor(
-    private val balanceController: BalanceController,
+class TokenUpdater @Inject constructor(
+    private val tokenController: TokenController,
 ) : NetworkUpdater() {
     override fun poll(
         key: Any?,
@@ -21,12 +19,12 @@ class BalanceUpdater @Inject constructor(
     ) {
         stop()
         updater = fixedRateTimer(
-            name = "update balance",
+            name = "update tokens",
             initialDelay = startIn.inWholeMilliseconds,
             period = frequency.inWholeMilliseconds
         ) {
             scope.launch {
-                balanceController.fetchBalance()
+                tokenController.update()
             }
         }
     }

apps/flipcash/core/src/main/res/values/strings.xml

@@ -55,6 +55,7 @@
     <string name="error_description_linkExpired">The cash was automatically returned to the sender because it wasn\'t collected within 7 days. Please ask them to send the cash again</string>
 
     <string name="subtitle_balanceIsHeldInUsdStablecoins">Your balance is held in US dollar stablecoins</string>
+    <string name="subtitle_currentValueOfAllCurrencies">The current value of your currencies</string>
     <string name="subtitle_ofUsdStablecoins">of US dollar stablecoins</string>
     <string name="subtitle_balanceEmptyState">Ask a friend to give you some cash with Flipcash, or deposit USDC from your crypto exchange or another crypto wallet</string>
     <string name="action_depositFunds">Deposit Funds</string>

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

@@ -69,7 +69,7 @@ private fun BalanceScreenContent(
         BalanceHeader(
             modifier = Modifier
                 .fillMaxWidth(),
-            balance = state.balance
+            balance = state.totalBalance
         ) {
             dispatchEvent(BalanceViewModel.Event.OpenCurrencySelection)
         }
@@ -175,27 +175,12 @@ private fun Preview_BalanceScreen_Empty() {
             Box(modifier = Modifier.background(CodeTheme.colors.background)) {
                 BalanceScreenContent(
                     state = BalanceViewModel.State(
-                        balance = LocalFiat(0.toFiat())
+                        balances = emptyList()
                     ),
                     feed = flowOf(PagingData.empty<ActivityFeedMessage>()).collectAsLazyPagingItems(),
                     dispatchEvent = {}
                 )
             }
         }
     }
-}
-
-@Preview
-@Composable
-private fun Preview_FeedList_Empty() {
-    FlipcashDesignSystem {
-        Box(modifier = Modifier.background(CodeTheme.colors.background)) {
-            FeedList(
-                state = BalanceViewModel.State(
-                    balance = LocalFiat(0.toFiat())
-                ),
-                feed = flowOf(PagingData.empty<ActivityFeedMessage>()).collectAsLazyPagingItems()
-            ) { }
-        }
-    }
 }

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

@@ -21,11 +21,13 @@ import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
-import com.getcode.opencode.controllers.BalanceController
+import com.getcode.opencode.controllers.TokenController
 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.opencode.model.financial.TokenWithLocalizedBalance
+import com.getcode.opencode.model.financial.sum
 import com.getcode.solana.keys.PublicKey
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.view.BaseViewModel2
@@ -44,27 +46,30 @@ import javax.inject.Inject
 
 @HiltViewModel
 internal class BalanceViewModel @Inject constructor(
-    balanceController: BalanceController,
+    tokenController: TokenController,
     feedCoordinator: ActivityFeedCoordinator,
     transactionController: TransactionController,
     featureFlags: FeatureFlagController,
     userManager: UserManager,
     resources: ResourceHelper,
-    private val exchange: Exchange,
+    exchange: Exchange,
     onrampController: OnRampAmountController,
 ) : BaseViewModel2<BalanceViewModel.State, BalanceViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent
 ) {
     data class State(
-        val balance: LocalFiat? = null,
+        val balances: List<TokenWithLocalizedBalance>? = null,
         val canViewDetails: Boolean = false,
         val preferredOnRampProvider: OnRampProvider? = null,
         val expandedItem: ID? = null,
-    )
+    ) {
+        val totalBalance: LocalFiat?
+            get() = balances.orEmpty().map { it.balance }.sum()
+    }
 
     sealed interface Event {
-        data class OnBalanceUpdated(val balance: LocalFiat) : Event
+        data class OnBalancesUpdated(val balances: List<TokenWithLocalizedBalance>) : Event
         data class OnTransactionDetailsEnabled(val enabled: Boolean) : Event
         data class OnPreferredOnRampProviderChanged(val provider: OnRampProvider?) : Event
         data class ViewDetails(val id: ID?) : Event
@@ -82,16 +87,22 @@ internal class BalanceViewModel @Inject constructor(
 
     init {
         combine(
-            balanceController.rawBalance,
+            tokenController.tokenBalances,
             exchange.observeBalanceRate(),
-        ) { balance, rate ->
-            LocalFiat(
-                usdc = balance,
-                converted = balance.convertingTo(rate),
-                rate = rate
-            )
+        ) { balances, rate ->
+            balances.map {
+                TokenWithLocalizedBalance(
+                    token = it.token,
+                    balance = LocalFiat(
+                        usdc = it.balance,
+                        converted = it.balance.convertingTo(rate),
+                        rate = rate
+
+                    )
+                )
+            }.sortedByDescending { it.balance.converted }
         }.onEach {
-            dispatchEvent(Event.OnBalanceUpdated(it))
+            dispatchEvent(Event.OnBalancesUpdated(it))
         }.launchIn(viewModelScope)
 
         featureFlags.observe(FeatureFlag.TransactionDetails)
@@ -159,7 +170,7 @@ internal class BalanceViewModel @Inject constructor(
                 onSuccess = {
                     viewModelScope.launch {
                         feedCoordinator.checkPendingMessagesForUpdates()
-                        balanceController.fetchBalance()
+                        tokenController.update()
                     }
                 }
             ).launchIn(viewModelScope)
@@ -232,7 +243,7 @@ internal class BalanceViewModel @Inject constructor(
                 Event.ResetSelections -> { state -> state }
                 is Event.OnCancelRequested -> { state -> state }
                 is Event.CancelTransfer -> { state -> state }
-                is Event.OnBalanceUpdated -> { state -> state.copy(balance = event.balance) }
+                is Event.OnBalancesUpdated -> { state -> state.copy(balances = event.balances) }
                 is Event.OnTransactionDetailsEnabled -> { state -> state.copy(canViewDetails = event.enabled) }
                 is Event.ViewDetails -> { state ->
                     val currentlyExpanded = state.expandedItem

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

@@ -35,7 +35,7 @@ internal fun BalanceHeader(
             }
         } else {
             Crossfade(balance.converted) { amount ->
-                val captionText = stringResource(R.string.subtitle_balanceIsHeldInUsdStablecoins)
+                val captionText = stringResource(R.string.subtitle_currentValueOfAllCurrencies)
                 AmountArea(
                     amountText = amount.formatted(),
                     isAltCaption = false,

apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolResolveDelegate.kt

@@ -21,7 +21,6 @@ import com.getcode.opencode.model.financial.Distribution
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.base58
-import com.getcode.utils.getPublicKeyBase58
 import com.getcode.utils.trace
 import javax.inject.Inject
 
@@ -162,8 +161,8 @@ class InternalPoolResolveDelegate @Inject constructor(
         val winnerCount = matchingBets.count()
 
         // Calculate base amount per winner and remainder
-        val baseAmountPerWinner = poolBalance.quarks / winnerCount
-        val remainderQuarks = poolBalance.quarks % winnerCount
+        val baseAmountPerWinner = poolBalance / winnerCount
+        val remainderQuarks = poolBalance % winnerCount
 
         // 2. otherwise, pay out all winning (matching bets)
         // unequal remainder is added to the 'remainderQuarks' winners

apps/flipcash/shared/pools/src/main/kotlin/com/flipcash/app/pools/PoolsCoordinator.kt

@@ -31,10 +31,7 @@ import com.getcode.opencode.controllers.AccountController
 import com.getcode.opencode.model.accounts.AccountFilter
 import com.getcode.opencode.model.core.ID
 import com.getcode.opencode.model.financial.Fiat
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -177,7 +174,7 @@ class PoolsCoordinator @Inject constructor(
             requestingOwner = owner,
             filter = AccountFilter.TokenAddress(pool.fundingDestination)
         ).map {
-            it.balance == Fiat.Zero
+            it.balance == 0L
         }.onFailure {
             return Result.failure(it)
         }

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -10,9 +10,9 @@ import com.flipcash.app.core.bill.BillState
 import com.flipcash.app.core.bill.PaymentValuation
 import com.flipcash.app.core.internal.bill.BillController
 import com.flipcash.app.core.internal.errors.showNetworkError
-import com.flipcash.app.core.internal.updater.BalanceUpdater
 import com.flipcash.app.core.internal.updater.ExchangeUpdater
 import com.flipcash.app.core.internal.updater.ProfileUpdater
+import com.flipcash.app.core.internal.updater.TokenUpdater
 import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.pools.PoolUpdater
@@ -37,7 +37,7 @@ import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
-import com.getcode.opencode.controllers.BalanceController
+import com.getcode.opencode.controllers.TokenController
 import com.getcode.opencode.controllers.TransactionController
 import com.getcode.opencode.internal.transactors.ReceiveGiftTransactorError
 import com.getcode.opencode.model.accounts.AccountCluster
@@ -91,7 +91,7 @@ class RealSessionController @Inject constructor(
     private val networkObserver: NetworkConnectivityListener,
     private val resources: ResourceHelper,
     private val vibrator: Vibrator,
-    private val balanceUpdater: BalanceUpdater,
+    private val tokenUpdater: TokenUpdater,
     private val exchangeUpdater: ExchangeUpdater,
     private val activityFeedUpdater: ActivityFeedUpdater,
     private val poolsUpdater: PoolsUpdater,
@@ -101,7 +101,7 @@ class RealSessionController @Inject constructor(
     private val shareConfirmationController: ShareableConfirmationController,
     private val toastController: ToastController,
     private val billingClient: BillingClient,
-    private val balanceController: BalanceController,
+    private val tokenController: TokenController,
     private val featureFlagController: FeatureFlagController,
     private val analytics: FlipcashAnalyticsService,
     appSettingsCoordinator: AppSettingsCoordinator,
@@ -237,7 +237,7 @@ class RealSessionController @Inject constructor(
     private fun startPolling() {
         if (userManager.authState.canAccessAuthenticatedApis) {
             exchangeUpdater.poll(scope = scope, frequency = 10.seconds, startIn = 10.seconds)
-            balanceUpdater.poll(scope = scope, frequency = 60.seconds, startIn = 0.seconds)
+            tokenUpdater.poll(scope = scope, frequency = 60.seconds, startIn = 0.seconds)
             activityFeedUpdater.poll(scope = scope, frequency = 60.seconds, startIn = 60.seconds)
             // TODO: once we have streams setup for pool this can be removed
             poolsUpdater.poll(scope = scope, frequency = 60.seconds, startIn = 45.seconds)
@@ -252,7 +252,7 @@ class RealSessionController @Inject constructor(
 
     private fun stopPolling() {
         exchangeUpdater.stop()
-        balanceUpdater.stop()
+        tokenUpdater.stop()
         activityFeedUpdater.stop()
         // TODO: once we have streams setup for pool this can be removed
         poolsUpdater.stop()
@@ -627,7 +627,7 @@ class RealSessionController @Inject constructor(
         ).onFailure {
             dismissBill(PutInWallet)
         }.onSuccess {
-            balanceController.fetchBalance()
+            tokenController.update()
             checkPendingItemsInFeed()
             dismissBill(PutInWallet)
         }

libs/currency-math/src/main/kotlin/com/flipcash/libs/currency/math/Estimator.kt

@@ -1,15 +1,14 @@
 package com.flipcash.libs.currency.math
 
 import com.flipcash.libs.currency.math.internal.DefaultMintDecimals
-import jakarta.inject.Inject
 import java.math.BigDecimal
 import java.math.BigInteger
 
-class Estimator @Inject constructor() {
-    fun currentPriceFor(quarks: Long): Result<BigDecimal> {
+object Estimator {
+    fun currentPriceFor(currentSupplyInQuarks: Long): Result<BigDecimal> {
         return runCatching {
             val scale = BigDecimal.TEN.pow(DefaultMintDecimals, mc)
-            val unscaledCurrentSupply = BigDecimal(quarks, mc)
+            val unscaledCurrentSupply = BigDecimal(currentSupplyInQuarks, mc)
             val scaledCurrentSupply = unscaledCurrentSupply.divide(scale, mc)
             scaledCurrentSupply
         }.fold(
@@ -74,8 +73,8 @@ class Estimator @Inject constructor() {
             val feesQuarks = unscaledFees
 
             BuyEstimation(
-                netTokensToReceive = tokensQuarks.toBigInteger(),
-                fees = feesQuarks.toBigInteger(),
+                netTokensToReceive = tokensQuarks,
+                fees = feesQuarks,
             )
         }
     }
@@ -110,19 +109,19 @@ class Estimator @Inject constructor() {
             val feesQuarks = unscaledFees
 
             SellEstimation(
-                netAmountToReceive = amountQuarks.toBigInteger(),
-                fees = feesQuarks.toBigInteger(),
+                netAmountToReceive = amountQuarks,
+                fees = feesQuarks,
             )
         }
     }
 }
 
 data class BuyEstimation(
-    val netTokensToReceive: BigInteger,
-    val fees: BigInteger,
+    val netTokensToReceive: BigDecimal,
+    val fees: BigDecimal,
 )
 
 data class SellEstimation(
-    val netAmountToReceive: BigInteger,
-    val fees: BigInteger,
+    val netAmountToReceive: BigDecimal,
+    val fees: BigDecimal,
 )