fix: properly support i18n number text formatting bidirectionally

Keypad supports using ',' as a separator but existing parsing was failing to split at the ',' due to how toDouble() works internally

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

Author: bmc08gt

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

@@ -73,18 +73,18 @@ internal class CashScreenViewModel @Inject constructor(
         val preferredOnRampProvider: OnRampProvider? = null,
     ) {
         val canGive: Boolean
-            get() = (amountAnimatedModel.amountData.amount.toDoubleOrNull() ?: 0.0) > 0.00
+            get() = (amountAnimatedModel.amountData.amount) > 0.00
 
         val maxAvailableForGive: String
             get() = maxForGive?.let { Fiat(it.first, it.second).formatted() }.orEmpty()
 
 
         val isError: Boolean
             get() {
-                if (amountAnimatedModel.amountData.amount.isEmpty()) return false
+                if (amountAnimatedModel.amountData.isEmpty()) return false
                 if (maxForGive != null) {
                     val enteredAmount = Fiat(
-                        fiat = amountAnimatedModel.amountData.amount.toDoubleOrNull() ?: 0.0,
+                        fiat = amountAnimatedModel.amountData.amount,
                         currencyCode = maxForGive.second
                     )
                     val limit = Fiat(maxForGive.first, maxForGive.second)
@@ -124,7 +124,7 @@ internal class CashScreenViewModel @Inject constructor(
     val checkBalanceLimit: () -> Boolean = {
         // this balance check differs from withdrawal due to the fact this is a localized check
         // whereas withdrawal is USD locked
-        val amount = stateFlow.value.amountAnimatedModel.amountData.amount.toDoubleOrNull() ?: 0.0
+        val amount = stateFlow.value.amountAnimatedModel.amountData.amount
         val enteredAmount = Fiat(
             fiat = amount,
             currencyCode = stateFlow.value.currencyModel.code ?: CurrencyCode.USD
@@ -173,7 +173,7 @@ internal class CashScreenViewModel @Inject constructor(
         isOverBalance
     }
     val checkSendLimit: () -> Boolean = {
-        val amount = stateFlow.value.amountAnimatedModel.amountData.amount.toDoubleOrNull() ?: 0.0
+        val amount = stateFlow.value.amountAnimatedModel.amountData.amount
         val currency = stateFlow.value.currencyModel
         val sendLimit =
             currency.code?.let { stateFlow.value.limits?.sendLimitFor(it) } ?: SendLimit.Zero

apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/internal/OnRampViewModel.kt

@@ -48,19 +48,17 @@ internal data class AmountEntryState(
     val selectedAmount: Fiat = Fiat.Zero,
 ) {
     val canAdd: Boolean
-        get() = (amountAnimatedModel.amountData.amount.toDoubleOrNull()
-            ?: 0.0) > 0.00
+        get() = (amountAnimatedModel.amountData.amount) > 0.00
 
     val maxAvailableToAdd: String
         get() = maxToAdd?.let { Fiat(it.first, it.second).formatted() }.orEmpty()
 
     val isError: Boolean
         get() {
-            if (amountAnimatedModel.amountData.amount.isEmpty()) return false
+            if (amountAnimatedModel.amountData.isEmpty()) return false
 
             if (maxToAdd != null) {
-                if ((amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                        ?: 0.0) <= maxToAdd.first
+                if ((amountAnimatedModel.amountData.amount) <= maxToAdd.first
                 ) {
                     return false
                 }
@@ -140,9 +138,7 @@ internal class OnRampViewModel @Inject constructor(
     }
 
     val checkFundingAmount: () -> Boolean = {
-        val amount =
-            stateFlow.value.amountEntryState.amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                ?: 0.0
+        val amount = stateFlow.value.amountEntryState.amountAnimatedModel.amountData.amount
         val currency = stateFlow.value.amountEntryState.currencyModel
         val sendLimit =
             currency.code?.let { stateFlow.value.amountEntryState.limits?.sendLimitFor(it) }

apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/create/PoolCreateViewModel.kt

@@ -58,19 +58,17 @@ internal data class BidEntryState(
     val selectedAmount: Fiat = Fiat.Zero,
 ) {
     val canSet: Boolean
-        get() = (amountAnimatedModel.amountData.amount.toDoubleOrNull()
-            ?: 0.0) > 0.00
+        get() = (amountAnimatedModel.amountData.amount) > 0.00
 
     val maxAvailableForBid: String
         get() = maxForBid?.let { Fiat(it.first, it.second).formatted() }.orEmpty()
 
     val isError: Boolean
         get() {
-            if (amountAnimatedModel.amountData.amount.isEmpty()) return false
+            if (amountAnimatedModel.amountData.isEmpty()) return false
 
             if (maxForBid != null) {
-                if ((amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                        ?: 0.0) <= maxForBid.first
+                if ((amountAnimatedModel.amountData.amount) <= maxForBid.first
                 ) {
                     return false
                 }
@@ -140,9 +138,7 @@ internal class PoolCreateViewModel @Inject constructor(
     }
 
     val checkBidLimit: () -> Boolean = {
-        val amount =
-            stateFlow.value.bidEntryState.amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                ?: 0.0
+        val amount = stateFlow.value.bidEntryState.amountAnimatedModel.amountData.amount
         val currency = stateFlow.value.bidEntryState.currencyModel
         val sendLimit =
             currency.code?.let { stateFlow.value.bidEntryState.limits?.sendLimitFor(it) }

apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/WithdrawalViewModel.kt

@@ -89,17 +89,16 @@ internal class WithdrawalViewModel @Inject constructor(
         val withdrawalState: LoadingSuccessState = LoadingSuccessState(),
     ) {
         val canWithdraw: Boolean
-            get() = (amountEntryState.amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                ?: 0.0) > 0.00
+            get() = (amountEntryState.amountAnimatedModel.amountData.amount) > 0.00
 
         val tokenBalance: Fiat
             get() = token?.balance ?: Fiat.Zero
 
         val isError: Boolean
             get() {
-                if (amountEntryState.amountAnimatedModel.amountData.amount.isEmpty()) return false
+                if (amountEntryState.amountAnimatedModel.amountData.isEmpty()) return false
                 val enteredAmount = Fiat(
-                    fiat = amountEntryState.amountAnimatedModel.amountData.amount.toDoubleOrNull() ?: 0.0,
+                    fiat = amountEntryState.amountAnimatedModel.amountData.amount,
                     currencyCode = tokenBalance.currencyCode
                 )
 
@@ -154,8 +153,7 @@ internal class WithdrawalViewModel @Inject constructor(
 
     val checkBalanceLimit: () -> Boolean = {
         val amount =
-            stateFlow.value.amountEntryState.amountAnimatedModel.amountData.amount.toDoubleOrNull()
-                ?: 0.0
+            stateFlow.value.amountEntryState.amountAnimatedModel.amountData.amount
         val conversionRate =
             exchange.rateToUsd(
                 stateFlow.value.amountEntryState.currencyModel.code ?: CurrencyCode.USD

services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt

@@ -5,12 +5,14 @@ import com.flipcash.libs.currency.math.Estimator
 import com.flipcash.libs.currency.math.divideWithHighPrecision
 import com.getcode.opencode.internal.extensions.fractionDigits
 import com.getcode.opencode.utils.roundTo
+import com.getcode.opencode.utils.toLocaleAwareDoubleOrNull
 import com.getcode.solana.keys.Mint
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 import java.math.BigDecimal
 import java.math.RoundingMode
 import java.text.DecimalFormat
+import java.text.NumberFormat
 import java.util.Currency
 import java.util.Locale
 
@@ -79,7 +81,7 @@ data class Fiat(
             false
         }
 
-        val formatter = DecimalFormat.getInstance(Locale.US).apply {
+        val formatter = DecimalFormat.getInstance().apply {
             val decimalDigits = currencyCode.fractionDigits
             val preferredDigits = when (rule) {
                 is FormattingRule.Length -> rule.decimalPlaces
@@ -131,7 +133,7 @@ data class Fiat(
     fun toDouble() = formatted(
         showPrefix = false,
         includeCommas = false
-    ).toDouble()
+    ).toLocaleAwareDoubleOrNull() ?: 0.0
 
     fun valueNonZero(): Boolean = toDouble() != 0.0
 
@@ -169,7 +171,7 @@ data class Fiat(
         val Zero = Fiat(0, CurrencyCode.USD)
 
         private fun parseStringToDouble(stringAmount: String, decimalPlaces: Int = 6): Double {
-            val formatter = DecimalFormat.getNumberInstance(Locale.getDefault()).apply {
+            val formatter = DecimalFormat.getNumberInstance(Locale.US).apply {
                 isParseIntegerOnly = false
                 minimumFractionDigits = decimalPlaces
                 maximumFractionDigits = decimalPlaces

services/opencode/src/main/kotlin/com/getcode/opencode/utils/String.kt

@@ -2,6 +2,8 @@ package com.getcode.opencode.utils
 
 import com.getcode.utils.encodeBase64
 import com.getcode.vendor.Base58
+import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
 
 fun String.addLeadingZero(upTo: Int): String {
     if (upTo < length) return this
@@ -39,5 +41,21 @@ fun String.padded(minCount: Int): String {
     }
 }
 
+fun String.toLocaleAwareDoubleOrNull(decimalPlaces: Int = 6): Double? {
+    val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+    // Use locale-aware NumberFormat for parsing to correctly handle decimal separators.
+    // We also need to handle the case where the input is just the separator (e.g., "," or ".")
+    // or ends with it, which parse() would fail on.
+    val sanitizedText = if (endsWith(separator)) this + "0" else this
+    return runCatching {
+        NumberFormat.getInstance().apply {
+            isGroupingUsed = false
+            isParseIntegerOnly = false
+            maximumFractionDigits = decimalPlaces
+            minimumFractionDigits = decimalPlaces
+        }.parse(sanitizedText)?.toDouble()
+    }.getOrNull()
+}
+
 typealias Base64String = String
 typealias Base58String = String

ui/components/src/main/kotlin/com/getcode/ui/components/text/AmountTextAnimated.kt

@@ -91,7 +91,7 @@ internal fun AmountTextAnimated(
     val staticX5 = CodeTheme.dimens.staticGrid.x5
 
     // Initialize visibility states based on uiModel
-    val initialAmount = uiModel.amountData.amount
+    val initialAmount = uiModel.amountData.amountText
     val isInitiallyZero = initialAmount == "0" || initialAmount.isEmpty()
     var decimalPointVisibility by remember { mutableStateOf(initialAmount.contains(DECIMAL_SEPARATOR)) }
     var zeroVisibility by remember { mutableStateOf(isInitiallyZero) }
@@ -108,16 +108,16 @@ internal fun AmountTextAnimated(
     val maxFontSize = textStyle.fontSize
 
     val commaVisibility = uiModel.amountData.commaVisibility
-    val amountSplit = uiModel.amountData.amount.split(DECIMAL_SEPARATOR)
-    val amountLastSplit = uiModel.amountDataLast.amount.split(DECIMAL_SEPARATOR)
+    val amountSplit = uiModel.amountData.amountText.split(DECIMAL_SEPARATOR)
+    val amountLastSplit = uiModel.amountDataLast.amountText.split(DECIMAL_SEPARATOR)
 
     val length1 = amountSplit[0].length
     val length2 = if (amountSplit.size > 1) amountSplit[1].length else 0
     val isDecimal = amountSplit.size > 1
     val isZero = amountSplit[0] == "0" || amountSplit[0].isEmpty()
 
     if (amountSplit.firstOrNull() != null && !isZero) {
-        firstDigit = uiModel.amountData.amount.first().toString()
+        firstDigit = uiModel.amountData.amountText.first().toString()
     }
 
     fun getValue(i1: Int, i2: Int): String? =

ui/components/src/main/kotlin/com/getcode/ui/components/text/NumberInputHelper.kt

@@ -1,6 +1,8 @@
 package com.getcode.ui.components.text
 
+import java.text.NumberFormat
 import java.text.DecimalFormatSymbols
+import java.util.Locale
 import kotlin.math.min
 
 
@@ -73,7 +75,7 @@ class NumberInputHelper {
     }
 
     private fun applyValue() {
-        amount = amountText.toDoubleOrNull() ?: 0.0
+        amount = amountText.toLocaleAwareDoubleOrNull() ?: 0.0
     }
 
     private fun formatAmount(amount: Double): String {
@@ -115,5 +117,20 @@ class NumberInputHelper {
         val GROUPING_SEPARATOR: Char get() = DecimalFormatSymbols.getInstance().groupingSeparator
     }
 
-    data class AmountAnimatedData(val amount: String = "0", val commaVisibility: List<Boolean> = listOf())
+    data class AmountAnimatedData(
+        internal val amountText: String = "0",
+        val commaVisibility: List<Boolean> = listOf()
+    ) {
+        fun isEmpty(): Boolean = amountText.isEmpty()
+        val amount: Double get() = amountText.toLocaleAwareDoubleOrNull() ?: 0.0
+    }
+}
+
+private fun String.toLocaleAwareDoubleOrNull(): Double? {
+    val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+    // Use locale-aware NumberFormat for parsing to correctly handle decimal separators.
+    // We also need to handle the case where the input is just the separator (e.g., "," or ".")
+    // or ends with it, which parse() would fail on.
+    val sanitizedText = if (endsWith(separator)) this + "0" else this
+    return runCatching { NumberFormat.getInstance().parse(sanitizedText)?.toDouble() }.getOrNull()
 }