From 7063101b708d22bc34d7aaa2c932891add36ceb3 Mon Sep 17 00:00:00 2001 From: Balrambhai Sharma Date: Thu, 9 May 2024 17:50:09 +0530 Subject: [PATCH] TP-66260 | Failure Bottomsheet FIx (#10792) --- .../com/naviapp/common/tab/InsuranceTabViewModel.kt | 11 ++++++++--- .../tab/insurance/ui/TrialInsuranceDashboardVM.kt | 4 +++- .../navigator/NaviInsuranceDeeplinkNavigator.kt | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/naviapp/common/tab/InsuranceTabViewModel.kt b/android/app/src/main/java/com/naviapp/common/tab/InsuranceTabViewModel.kt index bdc6526951..0974543b7b 100644 --- a/android/app/src/main/java/com/naviapp/common/tab/InsuranceTabViewModel.kt +++ b/android/app/src/main/java/com/naviapp/common/tab/InsuranceTabViewModel.kt @@ -6,8 +6,8 @@ import com.navi.analytics.utils.NaviTrackEvent import com.navi.base.model.CtaData import com.navi.base.utils.isNotNull import com.navi.base.utils.isNull -import com.navi.common.network.models.ErrorMetaData import com.navi.common.analytics.NaviAnalytics +import com.navi.common.network.models.ErrorMetaData import com.navi.common.uitron.model.action.CtaAction import com.navi.common.utils.SingleLiveEvent import com.navi.common.viewmodel.BaseVM @@ -48,7 +48,9 @@ class InsuranceTabViewModel @Inject constructor( fun fetchInsuranceTabDetails() { - _insuranceTabDataFlow.update { it.copy(isLoading = true) } + if (_insuranceTabDataFlow.value.data.isNull()) { + _insuranceTabDataFlow.update { it.copy(isLoading = true) } + } viewModelScope.safeLaunch(coroutineContext = Dispatchers.IO) { val response = repository.fetchInsuranceTabPage() if (response.error.isNull() && response.errors.isNullOrEmpty() && response.data.isNotNull()) { @@ -85,7 +87,10 @@ class InsuranceTabViewModel @Inject constructor( is AnalyticsAction -> { NaviTrackEvent.trackEvent( - uiTronAction.eventName ?: "", uiTronAction.eventProperties, uiTronAction.isNeededForAppsflyer, uiTronAction.isNeededForFirebase + uiTronAction.eventName ?: "", + uiTronAction.eventProperties, + uiTronAction.isNeededForAppsflyer, + uiTronAction.isNeededForFirebase ) } diff --git a/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardVM.kt b/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardVM.kt index da3b579262..d0848743c0 100644 --- a/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardVM.kt +++ b/android/app/src/main/java/com/naviapp/common/tab/insurance/ui/TrialInsuranceDashboardVM.kt @@ -45,7 +45,9 @@ class TrialInsuranceDashboardVM @Inject constructor( val redirectionCta = SingleLiveEvent() fun fetchTrialInsuranceTabData() { - _trialInsuranceDashboardFlow.update { it.copy(isLoading = true) } + if (_trialInsuranceDashboardFlow.value.data.isNull()) { + _trialInsuranceDashboardFlow.update { it.copy(isLoading = true) } + } viewModelScope.launch(Dispatchers.IO) { val response = repository.fetchTrialInsuranceDashboardResponse() if (response.error.isNull() && response.errors.isNullOrEmpty() && response.data.isNotNull()) { diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt b/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt index 0bcac55647..c30336c939 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt @@ -189,7 +189,7 @@ object NaviInsuranceDeeplinkNavigator { DeepLinkManager.getDeepLinkListener() ?.navigateTo( activity = activity, - ctaData = CtaData(type = ctaData.type, url = ctaData.url, parameters = ctaData.parameters), + ctaData = if(ctaData.type == CtaType.USE_ROOT_DEEPLINK_NAVIGATOR.value) ctaData.copy(type = null) else ctaData, finish = finish, bundle = bundle, requestCode = requestCode?: GI_REQUEST_CODE,