chore(ocp/fiat): create a proper toDouble() and use for value comparisons

bmc08gt · bmc08gt · commit 850c001e3371 · 2025-11-06T12:19:43.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
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
@@ -22,7 +22,6 @@ import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.Limits
 import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.Rate
 import com.getcode.opencode.model.financial.SendLimit
 import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
 import com.getcode.opencode.model.financial.minus
@@ -287,7 +286,7 @@ internal class CashScreenViewModel @Inject constructor(
             .onEach { (limits, balance) ->
                 val sendLimit = limits?.sendLimitFor(balance.rate.currency) ?: SendLimit.Zero
                 val nextTransactionLimit = sendLimit.nextTransaction
-                val max = min(nextTransactionLimit, balance.nativeAmount.doubleValue)
+                val max = min(nextTransactionLimit, balance.nativeAmount.decimalValue)
                 dispatchEvent(Event.OnMaxDetermined(max, balance.rate.currency))
             }.launchIn(viewModelScope)
 
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
@@ -9,13 +9,11 @@ import com.flipcash.app.activityfeed.ActivityFeedCoordinator
 import com.flipcash.app.core.extensions.onResult
 import com.flipcash.app.core.ui.CurrencyHolder
 import com.flipcash.features.withdrawal.R
-import com.flipcash.libs.currency.math.Estimator
 import com.flipcash.services.analytics.AnalyticsEvent
 import com.flipcash.services.analytics.FlipcashAnalyticsService
 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
@@ -25,10 +23,8 @@ import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Rate
 import com.getcode.opencode.model.financial.TokenWithBalance
-import com.getcode.opencode.model.financial.TokenWithLocalizedBalance
 import com.getcode.opencode.model.financial.minus
 import com.getcode.opencode.model.transactions.WithdrawalAvailability
-import com.getcode.opencode.utils.roundTo
 import com.getcode.solana.keys.Mint
 import com.getcode.ui.components.text.AmountAnimatedInputUiModel
 import com.getcode.ui.components.text.NumberInputHelper
diff --git a/apps/flipcash/shared/authentication/src/main/kotlin/com/flipcash/app/auth/AuthManager.kt b/apps/flipcash/shared/authentication/src/main/kotlin/com/flipcash/app/auth/AuthManager.kt
@@ -15,6 +15,7 @@ import com.flipcash.services.user.UserManager
 import com.flipcash.shared.authentication.BuildConfig
 import com.getcode.crypt.MnemonicPhrase
 import com.getcode.opencode.controllers.BalanceController
+import com.getcode.opencode.controllers.TokenController
 import com.getcode.opencode.model.core.ID
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
@@ -34,7 +35,7 @@ class AuthManager @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
     private val accountController: AccountController,
     private val pushController: PushController,
-    private val balanceController: BalanceController,
+    private val tokenController: TokenController,
     private val persistence: PersistenceProvider,
     private val featureFlagController: FeatureFlagController,
     private val appSettings: AppSettingsCoordinator,
@@ -195,7 +196,7 @@ class AuthManager @Inject constructor(
         pushController.deleteTokens()
         notificationManager.cancelAll()
         userManager.clear()
-        balanceController.reset()
+        tokenController.reset()
         persistence.close()
         featureFlagController.reset()
         appSettings.reset()
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt
@@ -49,7 +49,6 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdc
 import com.getcode.opencode.model.transactions.AirdropType
 import com.getcode.opencode.utils.nonce
-import com.getcode.solana.keys.Mint
 import com.getcode.ui.core.RestrictionType
 import com.getcode.util.permissions.PermissionResult
 import com.getcode.util.resources.ResourceHelper
@@ -363,7 +362,7 @@ class RealSessionController @Inject constructor(
     }
 
     override fun showBill(bill: Bill) {
-        if (bill.amount.nativeAmount.doubleValue == 0.0) return
+        if (bill.amount.nativeAmount.decimalValue == 0.0) return
         val owner = userManager.accountCluster ?: return
 
         if (!networkObserver.isConnected) {
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/toast/ToastController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/toast/ToastController.kt
@@ -40,14 +40,14 @@ class ToastController @Inject constructor(
         isDeposit: Boolean,
         initialDelay: Duration = INITIAL_DELAY
     ) {
-        if (amount.nativeAmount.doubleValue == 0.0) {
+        if (amount.nativeAmount.decimalValue == 0.0) {
             return
         }
 
         synchronized(toastQueue) {
             // Check for matching toast (same amount, opposite isDeposit)
             val matchingToast = toastQueue.find { toast ->
-                toast.amount.nativeAmount.doubleValue == amount.nativeAmount.doubleValue &&
+                toast.amount.nativeAmount.decimalValue == amount.nativeAmount.decimalValue &&
                         toast.isDeposit != isDeposit
             }
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/analytics/Analytics.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/analytics/Analytics.kt
@@ -457,7 +457,7 @@ private fun AnalyticsEvent.properties(
             }
             is AnalyticsEvent.WalletRequestAmount -> {
                 put("Provider", providerName)
-                put("Fiat", nativeAmount?.doubleValue.toString())
+                put("Fiat", nativeAmount?.decimalValue.toString())
                 put("Currency", nativeAmount?.currencyCode?.name.orEmpty())
             }
             is AnalyticsEvent.WalletSubmitTransaction -> {
@@ -473,20 +473,20 @@ private fun AnalyticsEvent.properties(
             is AnalyticsEvent.OnRampOpenEvent -> Unit
             is AnalyticsEvent.OnRampVerificationEvent -> Unit
             AnalyticsEvent.OnRampPurchaseEvent.Completed -> {
-                put("Fiat", nativeAmount?.doubleValue.toString())
+                put("Fiat", nativeAmount?.decimalValue.toString())
                 put("Currency", nativeAmount?.currencyCode?.name.orEmpty())
             }
             AnalyticsEvent.OnRampPurchaseEvent.EnterCustomAmount -> Unit
             AnalyticsEvent.OnRampPurchaseEvent.InvokePayment -> {
-                put("Fiat", nativeAmount?.doubleValue.toString())
+                put("Fiat", nativeAmount?.decimalValue.toString())
                 put("Currency", nativeAmount?.currencyCode?.name.orEmpty())
             }
             AnalyticsEvent.OnRampPurchaseEvent.InvokePaymentCustom -> {
-                put("Fiat", nativeAmount?.doubleValue.toString())
+                put("Fiat", nativeAmount?.decimalValue.toString())
                 put("Currency", nativeAmount?.currencyCode?.name.orEmpty())
             }
             AnalyticsEvent.OnRampPurchaseEvent.PresetSelected -> {
-                put("Fiat", nativeAmount?.doubleValue.toString())
+                put("Fiat", nativeAmount?.decimalValue.toString())
                 put("Currency", nativeAmount?.currencyCode?.name.orEmpty())
             }
         }
@@ -506,7 +506,7 @@ private fun AnalyticsEvent.properties(
 private fun LocalFiat.asProperties(): Map<String, String> {
     return buildMap {
         putAll(underlyingTokenAmount.asProperties())
-        "Fiat" to nativeAmount.doubleValue.toString()
+        "Fiat" to nativeAmount.decimalValue.toString()
         "Exchange Rate" to rate.fx.toString()
         "Currency" to rate.currency.name
         "Mint" to mint.base58()
@@ -515,7 +515,7 @@ private fun LocalFiat.asProperties(): Map<String, String> {
 
 private fun Fiat.asProperties(): Map<String, String> {
     return buildMap {
-        "USDC" to doubleValue.toString()
+        "USDC" to decimalValue.toString()
         "Quarks" to quarks.toDouble().toString()
     }
 }
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/extensions/LocalToProtobuf.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/extensions/LocalToProtobuf.kt
@@ -78,7 +78,7 @@ internal fun PoolMetadata.toProto(): PoolModels.SignedPoolMetadata {
         .setBuyIn(
             Common.FiatPaymentAmount.newBuilder()
                 .setCurrency(buyIn.currencyCode.name.lowercase())
-                .setNativeAmount(buyIn.doubleValue)
+                .setNativeAmount(buyIn.decimalValue)
         )
         .setFundingDestination(fundingDestination.asPublicKey())
         .setIsOpen(isOpen)
diff --git a/services/opencode/src/androidTest/kotlin/com/getcode/opencode/model/core/OpenCodePayloadTests.kt b/services/opencode/src/androidTest/kotlin/com/getcode/opencode/model/core/OpenCodePayloadTests.kt
@@ -23,7 +23,7 @@ class OpenCodePayloadTests {
         // --------------------------------------------------------
 
         assertEquals(PayloadKind.Cash.value, decoded.kind.value)
-        assertEquals(5.00, decoded.fiat?.doubleValue)
+        assertEquals(5.00, decoded.fiat?.decimalValue)
         assertEquals(nonce, decoded.nonce)
     }
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/BalanceController.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/BalanceController.kt
@@ -81,7 +81,7 @@ class BalanceController @Inject constructor(
     }
 
     suspend fun add(fiat: LocalFiat) {
-        if (_rawBalance.value.doubleValue == 0.0) {
+        if (_rawBalance.value.decimalValue == 0.0) {
             // attempt to fetch prior to append
             fetchBalance()
         } else {
@@ -90,7 +90,7 @@ class BalanceController @Inject constructor(
     }
 
     suspend fun subtract(fiat: LocalFiat) {
-        if (_rawBalance.value.doubleValue == 0.0) {
+        if (_rawBalance.value.decimalValue == 0.0) {
             // attempt to fetch prior to append
             fetchBalance()
         } else {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/TokenController.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/controllers/TokenController.kt
@@ -31,8 +31,6 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.concurrent.atomics.AtomicBoolean
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
 
 @Singleton
 @OptIn(ExperimentalAtomicApi::class)
@@ -93,7 +91,7 @@ class TokenController @Inject constructor(
 
     private suspend fun modifyBalance(token: Token, operation: (Fiat) -> Fiat) {
         val balance = mintBalances.value[token.address] ?: Fiat.Zero
-        if (balance.doubleValue == 0.0) {
+        if (balance.decimalValue == 0.0) {
             // attempt to fetch prior to modifying balance
             fetchBalanceForToken(token.address)
         } else {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt
@@ -224,6 +224,6 @@ internal fun LocalFiat.asExchangeData(): TransactionService.ExchangeData {
         .setQuarks(underlyingTokenAmount.quarks)
         .setCurrency(rate.currency.name.lowercase())
         .setExchangeRate(rate.fx)
-        .setNativeAmount(nativeAmount.doubleValue)
+        .setNativeAmount(nativeAmount.decimalValue)
         .build()
 }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt
@@ -23,9 +23,6 @@ data class Fiat(
     val decimalValue: Double
         get() = quarks.toDouble() / MULTIPLIER
 
-    val doubleValue: Double
-        get() = decimalValue
-
     val isNegative: Boolean
         get() = quarks < 0
 
@@ -63,7 +60,7 @@ data class Fiat(
 
     fun rounded(decimalPlaces: Int = 2): Fiat {
         return Fiat(
-            fiat = doubleValue.roundTo(decimalPlaces, ROUNDING_MODE),
+            fiat = decimalValue.roundTo(decimalPlaces, ROUNDING_MODE),
             currencyCode = currencyCode
         )
     }
@@ -73,6 +70,7 @@ data class Fiat(
         formatting: Formatting = Formatting.None,
         showPrefix: Boolean = true,
         suffix: String? = null,
+        includeCommas: Boolean = true,
     ): String {
         val shouldTruncate = if (formatting is Formatting.Truncated) {
             val fractionalPart = decimalValue - decimalValue.toLong()
@@ -107,6 +105,7 @@ data class Fiat(
             negativePrefix = prefix
             positiveSuffix = suffix?.prependIndent(" ").orEmpty()
             negativeSuffix = suffix?.prependIndent(" ").orEmpty()
+            isGroupingUsed = includeCommas
         }
 
         return formatter.format(decimalValue)
@@ -132,17 +131,15 @@ data class Fiat(
     // Comparable implementation
     override fun compareTo(other: Fiat): Int = this.quarks.compareTo(other.quarks)
 
-    fun valueLessThan(other: Fiat): Boolean =
-        this.formatted(showPrefix = false).toDouble() < other.formatted(showPrefix = false).toDouble()
-
-    fun valueGreaterThan(other: Fiat): Boolean =
-        this.formatted(showPrefix = false).toDouble() > other.formatted(showPrefix = false).toDouble()
-
-    fun valueGreaterThanOrEqualTo(other: Fiat): Boolean =
-        this.formatted(showPrefix = false).toDouble() >= other.formatted(showPrefix = false).toDouble()
+    fun toDouble() = formatted(
+        showPrefix = false,
+        includeCommas = false
+    ).toDouble()
 
-    fun valueLessThanOrEqualTo(other: Fiat): Boolean =
-        this.formatted(showPrefix = false).toDouble() <= other.formatted(showPrefix = false).toDouble()
+    fun valueLessThan(other: Fiat): Boolean = toDouble() < other.toDouble()
+    fun valueGreaterThan(other: Fiat): Boolean = toDouble() > other.toDouble()
+    fun valueGreaterThanOrEqualTo(other: Fiat): Boolean = toDouble() >= other.toDouble()
+    fun valueLessThanOrEqualTo(other: Fiat): Boolean = toDouble() <= other.toDouble()
 
     fun estimatedTokenAmountIn(token: Token?, fractionDigits: Int? = token?.decimals): String {
         if (token?.address == Mint.usdc) {
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/transactions/TransactionMetadata.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/transactions/TransactionMetadata.kt
@@ -67,7 +67,7 @@ sealed interface TransactionMetadata {
             exchangeData = ExchangeData.WithRate(
                 currencyCode = amount.rate.currency.name,
                 exchangeRate = amount.rate.fx,
-                nativeAmount = amount.nativeAmount.doubleValue,
+                nativeAmount = amount.nativeAmount.decimalValue,
                 quarks = amount.underlyingTokenAmount.quarks,
                 mint = mint,
             ),
@@ -117,7 +117,7 @@ sealed interface TransactionMetadata {
             exchangeData = ExchangeData.WithRate(
                 currencyCode = amount.rate.currency.name,
                 exchangeRate = amount.rate.fx,
-                nativeAmount = amount.nativeAmount.doubleValue,
+                nativeAmount = amount.nativeAmount.decimalValue,
                 quarks = amount.underlyingTokenAmount.quarks,
                 mint = mint
             ),

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,7 @@ private fun AnalyticsEvent.properties(`
`457`	`457`	`}`
`458`	`458`	`is AnalyticsEvent.WalletRequestAmount -> {`
`459`	`459`	`put("Provider", providerName)`
`460`		`- put("Fiat", nativeAmount?.doubleValue.toString())`
	`460`	`+ put("Fiat", nativeAmount?.decimalValue.toString())`
`461`	`461`	`put("Currency", nativeAmount?.currencyCode?.name.orEmpty())`
`462`	`462`	`}`
`463`	`463`	`is AnalyticsEvent.WalletSubmitTransaction -> {`
`@@ -473,20 +473,20 @@ private fun AnalyticsEvent.properties(`
`473`	`473`	`is AnalyticsEvent.OnRampOpenEvent -> Unit`
`474`	`474`	`is AnalyticsEvent.OnRampVerificationEvent -> Unit`
`475`	`475`	`AnalyticsEvent.OnRampPurchaseEvent.Completed -> {`
`476`		`- put("Fiat", nativeAmount?.doubleValue.toString())`
	`476`	`+ put("Fiat", nativeAmount?.decimalValue.toString())`
`477`	`477`	`put("Currency", nativeAmount?.currencyCode?.name.orEmpty())`
`478`	`478`	`}`
`479`	`479`	`AnalyticsEvent.OnRampPurchaseEvent.EnterCustomAmount -> Unit`
`480`	`480`	`AnalyticsEvent.OnRampPurchaseEvent.InvokePayment -> {`
`481`		`- put("Fiat", nativeAmount?.doubleValue.toString())`
	`481`	`+ put("Fiat", nativeAmount?.decimalValue.toString())`
`482`	`482`	`put("Currency", nativeAmount?.currencyCode?.name.orEmpty())`
`483`	`483`	`}`
`484`	`484`	`AnalyticsEvent.OnRampPurchaseEvent.InvokePaymentCustom -> {`
`485`		`- put("Fiat", nativeAmount?.doubleValue.toString())`
	`485`	`+ put("Fiat", nativeAmount?.decimalValue.toString())`
`486`	`486`	`put("Currency", nativeAmount?.currencyCode?.name.orEmpty())`
`487`	`487`	`}`
`488`	`488`	`AnalyticsEvent.OnRampPurchaseEvent.PresetSelected -> {`
`489`		`- put("Fiat", nativeAmount?.doubleValue.toString())`
	`489`	`+ put("Fiat", nativeAmount?.decimalValue.toString())`
`490`	`490`	`put("Currency", nativeAmount?.currencyCode?.name.orEmpty())`
`491`	`491`	`}`
`492`	`492`	`}`
`@@ -506,7 +506,7 @@ private fun AnalyticsEvent.properties(`
`506`	`506`	`private fun LocalFiat.asProperties(): Map<String, String> {`
`507`	`507`	`return buildMap {`
`508`	`508`	`putAll(underlyingTokenAmount.asProperties())`
`509`		`- "Fiat" to nativeAmount.doubleValue.toString()`
	`509`	`+ "Fiat" to nativeAmount.decimalValue.toString()`
`510`	`510`	`"Exchange Rate" to rate.fx.toString()`
`511`	`511`	`"Currency" to rate.currency.name`
`512`	`512`	`"Mint" to mint.base58()`
`@@ -515,7 +515,7 @@ private fun LocalFiat.asProperties(): Map<String, String> {`
`515`	`515`
`516`	`516`	`private fun Fiat.asProperties(): Map<String, String> {`
`517`	`517`	`return buildMap {`
`518`		`- "USDC" to doubleValue.toString()`
	`518`	`+ "USDC" to decimalValue.toString()`
`519`	`519`	`"Quarks" to quarks.toDouble().toString()`
`520`	`520`	`}`
`521`	`521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ internal fun PoolMetadata.toProto(): PoolModels.SignedPoolMetadata {`
`78`	`78`	`.setBuyIn(`
`79`	`79`	`Common.FiatPaymentAmount.newBuilder()`
`80`	`80`	`.setCurrency(buyIn.currencyCode.name.lowercase())`
`81`		`- .setNativeAmount(buyIn.doubleValue)`
	`81`	`+ .setNativeAmount(buyIn.decimalValue)`
`82`	`82`	`)`
`83`	`83`	`.setFundingDestination(fundingDestination.asPublicKey())`
`84`	`84`	`.setIsOpen(isOpen)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class OpenCodePayloadTests {`
`23`	`23`	`// --------------------------------------------------------`
`24`	`24`
`25`	`25`	`assertEquals(PayloadKind.Cash.value, decoded.kind.value)`
`26`		`- assertEquals(5.00, decoded.fiat?.doubleValue)`
	`26`	`+ assertEquals(5.00, decoded.fiat?.decimalValue)`
`27`	`27`	`assertEquals(nonce, decoded.nonce)`
`28`	`28`	`}`
`29`	`29`	`}`