From f4dc5f848ea5e4e5934c840311bd1c23373a56fe Mon Sep 17 00:00:00 2001
From: Akshita Singh <akshita.singh@navi.com>
Date: Mon, 9 Dec 2024 15:31:43 +0530
Subject: [PATCH] NTP-15268 | send money feature tag fix (#14037)

---
 .../common/sendmoney/model/view/SendMoneyModels.kt        | 2 +-
 .../common/sendmoney/viewmodel/SendMoneyViewModel.kt      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/model/view/SendMoneyModels.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/model/view/SendMoneyModels.kt
index 7f14cd76d0..0544af4150 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/model/view/SendMoneyModels.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/model/view/SendMoneyModels.kt
@@ -100,7 +100,7 @@ data class PayeeEntity(
     val accountType: String? = null,
     val accountNumber: String? = null,
     val bankImgUrl: String = EMPTY,
-    val featureTags: List<String> = listOf(),
+    val featureTags: List<String>? = null,
     val isNpciData: Boolean = false
 ) : Parcelable
 
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt
index 6a64a74d76..71a6b75317 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt
@@ -860,10 +860,10 @@ constructor(
 
     private suspend fun updateAccountTypeEligibilityMap() {
         val featureTags = payeeEntity.value.featureTags
-        if (featureTags.isNotEmpty()) {
+        if (featureTags?.isNotNullAndNotEmpty() == true) {
             accountTypeEligibilityMap =
                 accountEligibilityMerchantHelper.fetchAccountTypeEligibilityMap(
-                    featureTags = payeeEntity.value.featureTags,
+                    featureTags = payeeEntity.value.featureTags ?: emptyList(),
                     screenName = screenName
                 )
         }
@@ -1150,7 +1150,7 @@ constructor(
 
         // Feature Tags check
         if (
-            payeeEntity.value.featureTags.isNotEmpty() &&
+            payeeEntity.value.featureTags?.isNotNullAndNotEmpty() == true &&
                 !accountEligibilityMerchantHelper.getAccountEligibility(
                     eligibility = accountTypeEligibilityMap[linkedAccountEntity.accountType],
                     amount = paymentAmount
@@ -1413,7 +1413,7 @@ constructor(
         if (linkedAccounts.isEmpty()) {
             return
         }
-        if (payeeEntity.value.featureTags.isEmpty()) {
+        if (payeeEntity.value.featureTags?.isEmpty() == true) {
             updateLiteAccountEligibilityOnPaymentAmountChange()
         } else { // accounts eligibility is dependent on feature tags
             val updatedAccountsEligibilityOnPaymentChange =