From 2a9fdf64c1f4f29c74a222d6a9e1e6897aec98a6 Mon Sep 17 00:00:00 2001 From: Mehul Garg Date: Tue, 22 Oct 2024 17:31:38 +0530 Subject: [PATCH] NTP-8487 | Mehul | back navigation keyboard<>cursor fix (#13267) --- .../feature/customerinput/CustomerDataInputViewModel.kt | 4 ++++ .../feature/customerinput/ui/CustomerDataInputScreen.kt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/CustomerDataInputViewModel.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/CustomerDataInputViewModel.kt index 1e0ef49788..b941edc959 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/CustomerDataInputViewModel.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/CustomerDataInputViewModel.kt @@ -126,6 +126,9 @@ constructor( private val _rewardsNudgeDetailEntity = MutableStateFlow(null) val rewardsNudgeDetailEntity = _rewardsNudgeDetailEntity.asStateFlow() + private val _isBackFromNavigation = MutableStateFlow(false) + val isBackFromNavigation = _isBackFromNavigation.asStateFlow() + private val _isNudgeLitmusExperimentEnabled = MutableStateFlow(false) val isNudgeLitmusExperimentEnabled = _isNudgeLitmusExperimentEnabled.asStateFlow() @@ -493,6 +496,7 @@ constructor( ) notifyError(billDetailsResponse) } + _isBackFromNavigation.update { true } _isBillDetailsLoading.update { false } } diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt index 9f9f80a8b6..738a674485 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/customerinput/ui/CustomerDataInputScreen.kt @@ -152,6 +152,8 @@ fun CustomerDataInputScreen( customerDataInputViewModel.rewardsNudgeDetailEntity.collectAsStateWithLifecycle() val isNudgeLitmusExperimentEnabled by customerDataInputViewModel.isNudgeLitmusExperimentEnabled.collectAsStateWithLifecycle() + val isBackFromNavigation by + customerDataInputViewModel.isBackFromNavigation.collectAsStateWithLifecycle() LaunchedEffect(Unit) { naviBbpsAnalytics.onLanded( @@ -302,7 +304,9 @@ fun CustomerDataInputScreen( Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.height(48.dp)) - LaunchedEffect(Unit) { showKeyboard = true } + if (!isBackFromNavigation) { + LaunchedEffect(Unit) { showKeyboard = true } + } } is CustomerInputScreenState.Error -> Unit }