From 65ecf46fd6b40f571e5b9f8c4af58258a2ededf4 Mon Sep 17 00:00:00 2001
From: Balrambhai Sharma <sharma.balrambhai@navi.com>
Date: Tue, 6 May 2025 19:59:38 +0530
Subject: [PATCH] NTP-56713 | ExternalId Fix (#16067)

---
 .../common/sendmoney/viewmodel/SendMoneyViewModel.kt      | 3 ++-
 .../navi/pay/tstore/list/repository/OrderRepository.kt    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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 b2286eb946..95586e2278 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
@@ -1194,7 +1194,8 @@ constructor(
             _conversationId.update {
                 chatManager.generateConversationId(
                     senderId = PreferenceManager.getStringPreference(USER_EXTERNAL_ID).orEmpty(),
-                    receiverId = payeeEntity.value.externalId ?: payeeEntity.value.vpa,
+                    receiverId =
+                        payeeEntity.value.externalId.orEmpty().ifBlank { payeeEntity.value.vpa },
                 )
             }
             naviCacheRepository.save(
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
index b039f85e4c..20384099b3 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt
@@ -591,13 +591,13 @@ constructor(
         }
 
         val payerConvId =
-            naviPayTransactionMetaData.payerInfo?.saExtCustId?.ifEmpty {
-                naviPayTransactionMetaData.payerInfo.vpa
+            naviPayTransactionMetaData.payerInfo?.saExtCustId.orEmpty().ifBlank {
+                naviPayTransactionMetaData.payerInfo?.vpa
             }
 
         val payeeConvId =
-            naviPayTransactionMetaData.payeeInfo?.saExtCustId?.ifEmpty {
-                naviPayTransactionMetaData.payeeInfo.vpa
+            naviPayTransactionMetaData.payeeInfo?.saExtCustId.orEmpty().ifBlank {
+                naviPayTransactionMetaData.payeeInfo?.vpa
             }
 
         if (payerConvId.isNullOrBlank() || payeeConvId.isNullOrBlank()) {