From e18f1fb17a55067faadbce9b7bf3ad676cc79ce4 Mon Sep 17 00:00:00 2001
From: Naman Khurmi <naman.khurmi@navi.com>
Date: Wed, 27 Mar 2024 21:23:23 +0530
Subject: [PATCH] =?UTF-8?q?TP-62107=20|=20Naman=20Khurmi=20|=20nullability?=
 =?UTF-8?q?=20check=20while=20computing=20for=20same=20=E2=80=A6=20(#10195?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Shivam Goyal <shivam.goyal@navi.com>
---
 .../common/handler/FillApplicationAndGetCtaResponseHandler.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/handler/FillApplicationAndGetCtaResponseHandler.kt b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/handler/FillApplicationAndGetCtaResponseHandler.kt
index 40e0f737b8..43cfd5772f 100644
--- a/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/handler/FillApplicationAndGetCtaResponseHandler.kt
+++ b/android/application-platform/navi-ap/src/main/kotlin/com/navi/ap/common/handler/FillApplicationAndGetCtaResponseHandler.kt
@@ -98,7 +98,8 @@ private fun handleCtaUrl(
                         ?.metaData
                         ?.get(APP_PLATFORM_SCREEN_STATE_ID)
                 setBackScreenData(activity, screenId, screenStateId)
-                val isSameScreen = screenId == queryMap?.get(APP_PLATFORM_SCREEN_ID)
+                val isSameScreen =
+                    screenId?.let { id -> id == queryMap?.get(APP_PLATFORM_SCREEN_ID) } ?: false
                 if (isSameScreen) {
                     viewModel.setScreenDefinitionState(
                         ApScreenDefinitionState.Success(