From 8634cd41d3fa478a560afa3a8eacf181ba8671a8 Mon Sep 17 00:00:00 2001
From: Ujjwal Kumar <ujjwal.kumar@navi.com>
Date: Thu, 22 May 2025 13:14:32 +0530
Subject: [PATCH] NTP-67053 | Removed check & updated hash logic for RSMS
 (#16262)

Co-authored-by: Balrambhai Sharma <sharma.balrambhai@navi.com>
---
 .../binding/viewmodel/NaviPayOnboardingViewModel.kt   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/binding/viewmodel/NaviPayOnboardingViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/binding/viewmodel/NaviPayOnboardingViewModel.kt
index a1c1598b00..a0875932f8 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/binding/viewmodel/NaviPayOnboardingViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/binding/viewmodel/NaviPayOnboardingViewModel.kt
@@ -22,6 +22,7 @@ import com.navi.base.cache.repository.NaviCacheRepository
 import com.navi.base.deeplink.util.DeeplinkConstants
 import com.navi.base.utils.BaseUtils
 import com.navi.base.utils.ResourceProvider
+import com.navi.base.utils.TrustedTimeAccessor
 import com.navi.base.utils.orFalse
 import com.navi.base.utils.orTrue
 import com.navi.common.di.CoroutineDispatcherProvider
@@ -1035,7 +1036,7 @@ constructor(
                                     RsmsBindingRequestData(
                                         integrityToken =
                                             integrityManager.requestIntegrityToken(
-                                                requestHash = deviceInfoProvider.getDeviceId()
+                                                requestHash = getRequestHashForIntegrityToken()
                                             ) ?: "",
                                         attemptIdentifier = null,
                                         internalDeviceId = null,
@@ -1274,7 +1275,7 @@ constructor(
                                                 integrityToken =
                                                     integrityManager.requestIntegrityToken(
                                                         requestHash =
-                                                            deviceInfoProvider.getDeviceId()
+                                                            getRequestHashForIntegrityToken()
                                                     ) ?: "",
                                             ),
                                 )
@@ -1537,6 +1538,10 @@ constructor(
         handleAction(action = NaviPayOnBoardingActions.AccountAddition)
     }
 
+    private suspend fun getRequestHashForIntegrityToken(): String {
+        return "${TrustedTimeAccessor.getCurrentTimeMillis()}|${deviceInfoProvider.getDeviceId()}"
+    }
+
     @OptIn(DelicateCoroutinesApi::class)
     private suspend fun showLinkedAccountState() {
         GlobalScope.launch(Dispatchers.IO) {
@@ -2169,8 +2174,6 @@ constructor(
     }
 
     private suspend fun getRsmsEligibilityStatus(): Boolean {
-        // TODO: To be removed for go live release
-        return false
         updateShowButtonLoader(true)
         val isRsmsTriggeredPreviouslyAndFailed =
             naviCacheRepository