From 7f46459090c93d65b88c365973217341bf7c9c6d Mon Sep 17 00:00:00 2001 From: Aditya Narayan Malik Date: Tue, 1 Jul 2025 18:21:48 +0530 Subject: [PATCH] NTP-39209 | Narayan | Mandate amount formatting (#15094) --- .../com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt | 6 +++--- .../viewmodel/MandateDetailOfPendingCategoryViewModel.kt | 5 +++-- .../launcher/viewmodel/NaviPayLauncherViewModel.kt | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt index a9873444b0..d21c2e9011 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/lite/ui/UpiLiteLoadingStates.kt @@ -168,7 +168,7 @@ fun UpiLiteLoadingStates( if (isAboveThreshold) { String.format( stringResource(R.string.np_setting_up_auto_top_upto), - enteredAmount, + enteredAmount.getDisplayableAmount(), ) } else { String.format(stringResource(R.string.np_setting_up_auto_top_up), enteredAmount) @@ -178,12 +178,12 @@ fun UpiLiteLoadingStates( if (isAboveThreshold) { String.format( stringResource(R.string.np_setting_up_auto_top_upto_and_activating), - enteredAmount, + enteredAmount.getDisplayableAmount(), ) } else { String.format( stringResource(R.string.np_setting_up_auto_top_up_and_activating), - enteredAmount, + enteredAmount.getDisplayableAmount(), ) } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt index 3d2e81b24c..95724ee2c3 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt @@ -15,6 +15,7 @@ import com.navi.base.utils.orZero import com.navi.common.network.models.RepoResult import com.navi.common.network.models.isSuccess import com.navi.common.network.models.isSuccessWithData +import com.navi.common.utils.CommonUtils.getDisplayableAmount import com.navi.common.utils.TemporaryStorageHelper import com.navi.pay.R import com.navi.pay.analytics.NaviPayAnalytics @@ -594,7 +595,7 @@ constructor( uiState = MandateDetailUIStateOfPendingCategory.Loading( titleId = R.string.setting_up_autopay_of_x, - titleArgs = mandateEntity?.amount, + titleArgs = mandateEntity?.amount?.getDisplayableAmount(), showLoader = true, ) ) @@ -768,7 +769,7 @@ constructor( uiState = MandateDetailUIStateOfPendingCategory.Loading( titleId = R.string.setting_up_autopay_of_x, - titleArgs = mandateEntity.amount, + titleArgs = mandateEntity.amount.getDisplayableAmount(), showLoader = true, ) ) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/launcher/viewmodel/NaviPayLauncherViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/launcher/viewmodel/NaviPayLauncherViewModel.kt index e4b3489e62..a4e56a2e89 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/launcher/viewmodel/NaviPayLauncherViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/launcher/viewmodel/NaviPayLauncherViewModel.kt @@ -584,7 +584,7 @@ constructor( String.format( locale = Locale.US, "%.2f", - notificationData["amount"].toString().toDoubleOrNull() ?: 0.0, + notificationData["amount"].toString().toPlainAmount().toDoubleOrNull() ?: 0.0, ) } catch (_: Exception) { "0.00"