varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-17003 | Vedant Aggarwal | Handling mam tag in UPI URI (#16347)

Browse Source
This commit is contained in:
vedant aggarwal
2025-05-27 19:42:28 +05:30
committed by GitHub
parent ab9f21dd1d
commit ae30fed7ff
2 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/navi-pay/src/main/kotlin/com/navi/pay/common/model/config/NaviPayDefaultConfig.kt
View File

@@ -140,6 +140,8 @@ data class DefaultConfigContent(
data class ConfigMessage(
@SerializedName("minPaymentAmountMessage")
val minPaymentAmountMessage: String = "Enter amount to pay",
@SerializedName("minPaymentAmountMessageForMinAmountTag")
val minPaymentAmountMessageForMinAmountTag: String = "Amount should be at least ₹",
@SerializedName("maxPaymentAmountMessage")
val maxPaymentAmountMessage: String = "Amount can’t be more than ₹20,00,000",
@SerializedName("maxPaymentAmountMessageForGallery")

52
android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt
View File

@@ -496,8 +496,15 @@ constructor(
var isRepeatPayment = false
val isAmountReadOnly by lazy {
payeeEntityFromSource?.amount.orEmpty().isAmountValidForSendMoney() ||
transactionType == UpiTransactionType.INTENT_PAY
// Amount should stay editable when positive minAmount is present.
val hasPositiveMinAmount =
payeeEntityFromSource?.minAmount?.toDoubleOrNull()?.let { it > 0.0 } ?: false
val payeeAmountIsValid = payeeEntityFromSource?.amount.orEmpty().isAmountValidForSendMoney()
val isIntentPay = transactionType == UpiTransactionType.INTENT_PAY
!hasPositiveMinAmount && (payeeAmountIsValid || isIntentPay)
}
private val _isEmiConversionSupported = MutableStateFlow(false)
@@ -1556,9 +1563,20 @@ constructor(
_isEmiConversionSupported.update { status }
}
fun isAmountValid() =
paymentAmount.value.text.isAmountValidForSendMoney() &&
(paymentAmount.value.text.toDoubleOrNull() ?: 0.0) <= getMaxSendMoneyAmount()
fun isAmountValid(): Boolean {
val paymentAmountText = paymentAmount.value.text
val amount = paymentAmountText.toDoubleOrNull() ?: return false
if (!paymentAmountText.isAmountValidForSendMoney()) return false
val withinUpperLimit = amount <= getMaxSendMoneyAmount()
// Parsed amount ≥ payee-specified minimum (if present).
val aboveOrEqualPayeeMin =
amount >= (payeeEntityFromSource?.minAmount?.toDoubleOrNull() ?: 0.0)
return withinUpperLimit && aboveOrEqualPayeeMin
}
private fun updateNaviPayDefaultConfig() {
viewModelScope.launch(coroutineDispatcherProvider.io) {
@@ -1704,6 +1722,11 @@ constructor(
getMaxSendMoneyErrorMessage() to NaviPayColor.onSurfaceCritical
}
numericValue < (payeeEntityFromSource?.minAmount?.toDoubleOrNull() ?: 0.0) -> {
"${naviPayDefaultConfig.config.configMessage.minPaymentAmountMessageForMinAmountTag}${payeeEntityFromSource?.minAmount?.getDisplayableAmount()}" to
NaviPayColor.onSurfaceCritical
}
else -> {
naviPayDefaultConfig.config.configMessage.invalidAmountGenericMessage to null
}
@@ -4244,13 +4267,18 @@ constructor(
private fun getMaxSendMoneyAmount(): Double {
val mccValue = payeeEntity.value.mcc
return if (isQrFromUploadImage) {
naviPayDefaultConfig.config.amountLimits.sendMoneyLimitForGalleyImage
} else if (payeeEntity.value.isMerchant) {
mccValue?.let { getMaxSendMoneyAmountForMerchant(it) }!!
} else {
naviPayDefaultConfig.config.amountLimits.sendMoneyDefaultLimit
}
val sourceAmount = payeeEntityFromSource?.amount?.toDoubleOrNull()?.takeIf { it > 0 }
val maxAllowedAmount =
when {
isQrFromUploadImage ->
naviPayDefaultConfig.config.amountLimits.sendMoneyLimitForGalleyImage
payeeEntity.value.isMerchant ->
mccValue?.let { getMaxSendMoneyAmountForMerchant(it) } ?: 0.0
else -> naviPayDefaultConfig.config.amountLimits.sendMoneyDefaultLimit
}
return sourceAmount?.coerceAtMost(maxAllowedAmount) ?: maxAllowedAmount
}
private fun getMaxSendMoneyAmountForMerchant(mccValue: String): Double {