From 77487a38aeb15882b10eedfe16959d39428ecd1a Mon Sep 17 00:00:00 2001 From: Sidharth Bamba Date: Wed, 4 Jun 2025 16:58:41 +0530 Subject: [PATCH] NTP-63647 | Sidharth Bamba | share receipt changes for bank account transfer (#16435) --- .../paymentsummary/model/view/ShareReceiptEntity.kt | 1 + .../common/paymentsummary/ui/PaymentSummaryScreen.kt | 7 +++++++ .../tstore/details/ui/upi/UpiReceiptEntityProvider.kt | 4 ++++ .../kotlin/com/navi/pay/utils/ShareReceiptUtils.kt | 10 ++++++---- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/model/view/ShareReceiptEntity.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/model/view/ShareReceiptEntity.kt index 04c1dbd457..7e441da6fc 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/model/view/ShareReceiptEntity.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/model/view/ShareReceiptEntity.kt @@ -38,4 +38,5 @@ data class ShareReceiptEntity( val currencySymbol: String, val isUpiGlobalTransaction: Boolean, val baseCurrencyAmount: String?, + val isBankAccountTransaction: Boolean, ) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt index 2de1fd5a1a..f661ef3f9b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt @@ -93,6 +93,7 @@ import com.navi.pay.management.common.paymentsummary.model.view.PaymentSummaryBo import com.navi.pay.management.common.paymentsummary.model.view.PaymentSummaryScreenState import com.navi.pay.management.common.paymentsummary.model.view.ShareReceiptEntity import com.navi.pay.management.common.paymentsummary.viewmodel.PaymentSummaryViewModel +import com.navi.pay.management.common.sendmoney.model.network.TransactionInitiationType import com.navi.pay.management.common.transaction.model.view.TransactionStatusOfView import com.navi.pay.management.common.transaction.util.isUpiGlobalTransaction import com.navi.pay.utils.NAVI_PAY_GREEN_TICK_LOTTIE @@ -247,6 +248,12 @@ fun PaymentSummaryScreen( isUpiGlobalTransaction = isUpiGlobalTransaction(transactionEntity), baseCurrencyAmount = transactionEntity?.transactionDetailEntity?.metaData?.baseAmount, + isBankAccountTransaction = + transactionEntity + ?.transactionDetailEntity + ?.metaData + ?.transactionInitiationMode == + TransactionInitiationType.PAY_TO_BANK_ACCOUNT.name, ), upiAppLogoBaseUrl = upiAppLogoBaseUrl, upiAppsIconList = upiAppsIconList, diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/UpiReceiptEntityProvider.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/UpiReceiptEntityProvider.kt index 8223785b63..25a0df83ce 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/UpiReceiptEntityProvider.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/upi/UpiReceiptEntityProvider.kt @@ -11,6 +11,7 @@ import com.navi.base.utils.orFalse import com.navi.pay.common.utils.getBankNameAccountNumberText import com.navi.pay.management.common.paymentsummary.model.view.ShareReceiptEntity import com.navi.pay.management.common.paymentsummary.model.view.ShareReceiptUiProperties +import com.navi.pay.management.common.sendmoney.model.network.TransactionInitiationType import com.navi.pay.management.common.transaction.model.network.TransactionStatus import com.navi.pay.onboarding.account.add.model.view.BankUiModel import com.navi.pay.tstore.list.model.network.OrderStatus @@ -80,6 +81,9 @@ class UpiReceiptEntityProvider { isUpiGlobalTransaction = orderEntity?.isUpiGlobalTransaction.orFalse(), baseCurrencyAmount = naviPayTransactionDetailsMetadata?.upiGlobalInfo?.baseAmount.orEmpty(), + isBankAccountTransaction = + naviPayTransactionDetailsMetadata?.paymentMode == + TransactionInitiationType.PAY_TO_BANK_ACCOUNT.name, ) return receiptDetailsEntity } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/ShareReceiptUtils.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/ShareReceiptUtils.kt index 0cc449b7c7..b6a789630b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/ShareReceiptUtils.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/ShareReceiptUtils.kt @@ -136,7 +136,8 @@ fun shareReceipt( fun getPayerPayeeFirstInfoValueText(): String { return if ( shareReceiptEntity.isSelfPayTransaction || - shareReceiptEntity.isUpiLiteClosureTransaction + shareReceiptEntity.isUpiLiteClosureTransaction || + shareReceiptEntity.isBankAccountTransaction ) shareReceiptEntity.payeeBankNameFormatted else if (shareReceiptEntity.isCredited) shareReceiptEntity.payerVpa.orEmpty() @@ -265,14 +266,15 @@ fun shareReceipt( fun LayoutShareTransactionDetailsBinding.setPayeeBankNameAndLogo() { payeeBankView.apply { - val isNotUpiLiteTopUpOrClosureOrSelfTransfer = + val isNotUpiLiteTopUpOrClosureOrSelfTransferOrBankTransfer = !shareReceiptEntity.isUpiLiteTopUpTransaction && !shareReceiptEntity.isUpiLiteClosureTransaction && - !shareReceiptEntity.isSelfPayTransaction + !shareReceiptEntity.isSelfPayTransaction && + !shareReceiptEntity.isBankAccountTransaction if ( shareReceiptEntity.payeeMcc == NAVI_PAY_DEFAULT_MCC && - isNotUpiLiteTopUpOrClosureOrSelfTransfer && + isNotUpiLiteTopUpOrClosureOrSelfTransferOrBankTransfer && shareReceiptEntity.payeeBankUrl.isNotNullAndNotEmpty() && shareReceiptEntity.payeeBankNameFormatted.isNotNullAndNotEmpty() ) {