Account Tab Decimal Formatting Added( Paparazzi sc update+ preview is…

…sue fixed)
Ivy-Apps · Oct 7, 2024 · d672bda · d672bda
1 parent 24bdfee
commit d672bda
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 42 deletions.
diff --git a/...ounts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Dark].png b/...ounts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Dark].png
diff --git a/...unts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Light].png b/...unts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Light].png
diff --git a/...ts_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Dark].png b/...ts_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Dark].png
diff --git a/...s_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Light].png b/...s_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Light].png
diff --git a/...enPaparazziTest_snapshot Categories nonCompact Screen with search bar[Dark].png b/...enPaparazziTest_snapshot Categories nonCompact Screen with search bar[Dark].png
diff --git a/...nPaparazziTest_snapshot Categories nonCompact Screen with search bar[Light].png b/...nPaparazziTest_snapshot Categories nonCompact Screen with search bar[Light].png
diff --git a/...s_CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Dark].png b/...s_CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Dark].png
diff --git a/..._CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Light].png b/..._CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Light].png
diff --git a/.../snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Dark].png b/.../snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Dark].png
diff --git a/...snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Light].png b/...snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Light].png
diff --git a/.../com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Dark].png b/.../com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Dark].png
diff --git a/...com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Light].png b/...com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Light].png
diff --git a/...s/com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Dark].png b/...s/com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Dark].png
diff --git a/.../com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Light].png b/.../com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Light].png
diff --git a/...y.transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Dark].png b/...y.transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Dark].png
diff --git a/....transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Light].png b/....transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Light].png
diff --git a/shared/ui/core/src/main/java/com/ivy/ui/FormatMoneyUseCase.kt b/shared/ui/core/src/main/java/com/ivy/ui/FormatMoneyUseCase.kt
@@ -34,11 +34,4 @@ class FormatMoneyUseCase(
             false -> withoutDecimalFormatter.format(value)
         }
     }
-
-    fun format(value: Double, showDecimalPoint: Boolean): String {
-        return when (showDecimalPoint) {
-            true -> withDecimalFormatter.format(value)
-            false -> withoutDecimalFormatter.format(value)
-        }
-    }
 }
diff --git a/shared/ui/core/src/test/java/com/ivy/ui/FormatMoneyUseCaseTest.kt b/shared/ui/core/src/test/java/com/ivy/ui/FormatMoneyUseCaseTest.kt
@@ -70,24 +70,4 @@ class FormatMoneyUseCaseTest {
         // then
         result shouldBe testCase.expectedOutput
     }
-
-    @Test
-    fun `validate decimal formatting when showDecimalPoint is passed as parameter`(
-        @TestParameter testCase: MoneyFormatterTestCase
-    ) {
-        // given
-        val context = mockk<Context>()
-        every { features.showDecimalNumber } returns mockk { coEvery { isEnabled(any()) } returns testCase.showDecimal }
-        every { devicePreferences.locale() } returns testCase.locale
-        formatMoneyUseCase = FormatMoneyUseCase(features, devicePreferences, context)
-
-        // when
-        val result = formatMoneyUseCase.format(
-            value = testCase.amount,
-            showDecimalPoint = testCase.showDecimal
-        )
-
-        // then
-        result shouldBe testCase.expectedOutput
-    }
 }
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BalanceRow.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BalanceRow.kt
@@ -26,7 +26,8 @@ import androidx.compose.ui.unit.sp
 import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.IvyWalletComponentPreview
-import com.ivy.legacy.utils.toDecimalFormatAsync
+import com.ivy.legacy.utils.format
+import com.ivy.legacy.utils.toDecimalFormat
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
 @Composable
@@ -93,10 +94,10 @@ fun BalanceRow(
 ) {
     val context = LocalContext.current
     var formattedBalance by remember {
-        mutableStateOf("$balance")
+        mutableStateOf(balance.format(2))
     }
     LaunchedEffect(balance) {
-        formattedBalance = balance.toDecimalFormatAsync(context = context)
+        formattedBalance = balance.toDecimalFormat(context = context)
     }
     Column(
         modifier = modifier,

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp
 import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.utils.format
-import com.ivy.legacy.utils.toDecimalFormatAsync
+import com.ivy.legacy.utils.toDecimalFormat
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
 @Composable
@@ -81,9 +81,9 @@ fun AmountCurrencyB1(
     hideIncome: Boolean = false
 ) {
     val context = LocalContext.current
-    var formattedAmount by remember { mutableStateOf("$amount") }
+    var formattedAmount by remember { mutableStateOf(amount.format(2)) }
     LaunchedEffect(amount) {
-        formattedAmount = amount.toDecimalFormatAsync(context)
+        formattedAmount = amount.toDecimalFormat(context)
     }
     val text = if (hideIncome) {
         "****"

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt
@@ -198,22 +198,14 @@ fun formatInputAmount(
     return null
 }
 
-suspend fun Double.toDecimalFormatAsync(context: Context): String {
+suspend fun Double.toDecimalFormat(context: Context): String {
     val appContext = context.applicationContext ?: error("Application Context Not Found")
     val entryPoint =
         EntryPoints.get(appContext, FormatMoneyUseCase.FormatMoneyUseCaseEntryPoint::class.java)
     val useCase = entryPoint.FormatMoneyUseCase()
     return useCase.format(value = this)
 }
 
-fun Double.toDecimalFormatSync(context: Context, showDecimalPoint: Boolean = true): String {
-    val appContext = context.applicationContext ?: error("Application Context Not Found")
-    val entryPoint =
-        EntryPoints.get(appContext, FormatMoneyUseCase.FormatMoneyUseCaseEntryPoint::class.java)
-    val useCase = entryPoint.FormatMoneyUseCase()
-    return useCase.format(value = this, showDecimalPoint = showDecimalPoint)
-}
-
 /**
 toInt on numbers in the range (-1.0, 0.0) (exclusive of boundaries) will produce a positive int 0
 So, this function append negative sign in that case