From d3bc1111fe5a3d1671a68605bc21e849eeb4091b Mon Sep 17 00:00:00 2001
From: Akshita Singh <akshita.singh@navi.com>
Date: Fri, 14 Feb 2025 18:48:48 +0530
Subject: [PATCH] NTP-38969 | first eligible account crash fix (#14986)

---
 .../SubsequentLiteMandateExecutionUseCase.kt    | 17 ++++++++---------
 .../sendmoney/viewmodel/SendMoneyViewModel.kt   |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/usecase/SubsequentLiteMandateExecutionUseCase.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/usecase/SubsequentLiteMandateExecutionUseCase.kt
index d12aeaaceb..978d3acd21 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/usecase/SubsequentLiteMandateExecutionUseCase.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/usecase/SubsequentLiteMandateExecutionUseCase.kt
@@ -451,15 +451,14 @@ constructor(
                 )
         )
         if (lastFailedMandateExecutionTimeStamp == null) {
-            return
+            naviCacheRepository.save(
+                naviCacheEntity =
+                    NaviCacheEntity(
+                        key = KEY_UPI_LITE_LAST_MANDATE_EXECUTION_TIMESTAMP,
+                        value = System.currentTimeMillis().toString(),
+                        version = 1,
+                    )
+            )
         }
-        naviCacheRepository.save(
-            naviCacheEntity =
-                NaviCacheEntity(
-                    key = KEY_UPI_LITE_LAST_MANDATE_EXECUTION_TIMESTAMP,
-                    value = System.currentTimeMillis().toString(),
-                    version = 1,
-                )
-        )
     }
 }
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 924db2fa5b..d7c737080a 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
@@ -1477,14 +1477,14 @@ constructor(
 
     // Return first eligible account
     // If not found then pick the first from the list
-    private fun findFirstEligibleAccount(): LinkedAccountEntity {
+    private fun findFirstEligibleAccount(): LinkedAccountEntity? {
 
         val linkedAccounts =
             (bankAccountsState.value as? BankAccountsState.AccountList)?.accounts ?: emptyList()
 
         return linkedAccounts.firstOrNull { it.eligibilityState.isAccountEligible }
             ?: selectedBankAccount.value
-            ?: linkedAccounts.first()
+            ?: linkedAccounts.firstOrNull()
     }
 
     private fun checkIsInternetAvailableOrShowError(