From 5b69791b595d7da76e494278bd3b2ba6bfa96ccc Mon Sep 17 00:00:00 2001
From: Prakhar Saxena <prakhar.saxena@navi.com>
Date: Mon, 26 May 2025 16:37:01 +0530
Subject: [PATCH] NTP-66598 | PS | fix add account with one-cc (#16315)

---
 .../nativepayment/sharedviewmodel/NaviCheckoutViewModel.kt      | 2 +-
 .../nativepayment/sharedviewmodel/NaviCheckoutViewModelV2.kt    | 1 -
 .../navi/payment/nativepayment/usecase/PmsSendMoneyUseCase.kt   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModel.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModel.kt
index cbf718f133..9c06b36c3b 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModel.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModel.kt
@@ -95,6 +95,7 @@ constructor(
 
     init {
         viewModelScope.safeLaunch(Dispatchers.IO) {
+            pmsLinkedAccountUseCase.clear()
             refreshLinkedAccounts()
             initUpiLiteSync()
         }
@@ -221,7 +222,6 @@ constructor(
 
     private suspend fun clearPaymentData() {
         paymentDataProvider.clear()
-        pmsLinkedAccountUseCase.clear()
     }
 
     protected suspend fun initializePaymentSession(source: String) {
diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModelV2.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModelV2.kt
index 6b05263393..2949ad1d37 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModelV2.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/sharedviewmodel/NaviCheckoutViewModelV2.kt
@@ -234,7 +234,6 @@ constructor(
             this.category = category
             this.tenantFlowName = tenantFlowName
             this.blacklistedMethodList = blacklistedMethodList
-            pmsLinkedAccountUseCase.clear()
             viewModelScope.safeLaunch {
                 val isOneClickCheckoutExperienceEnabled = isOneClickCheckoutExperienceEnabled()
                 naviPaymentAnalytics.onScreenLanded(experimentVariantName = experimentVariant)
diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/usecase/PmsSendMoneyUseCase.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/usecase/PmsSendMoneyUseCase.kt
index 54d401a3b7..005dbd313d 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/usecase/PmsSendMoneyUseCase.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/usecase/PmsSendMoneyUseCase.kt
@@ -328,7 +328,7 @@ constructor(
         selectedBankAccount.isArcProtected = naviUpiTransactionInfo.isArcProtected
         sendMoneyUseCase.executeSendMoney(
             payeeEntity =
-                Uri.parse(naviUpiTransactionInfo.naviPayUpiUriKey)
+                Uri.parse(naviUpiTransactionInfo.naviPayUpiUriKey.orEmpty())
                     .getPayeeEntity(isVerifiedVpa = true),
             upiRequestId = naviUpiTransactionInfo.upiRequestId,
             selectedBankAccount = selectedBankAccount,