From 179801df8c8bfd4e0634caa17786a30738445994 Mon Sep 17 00:00:00 2001 From: Prajjaval Verma Date: Sat, 9 Nov 2024 01:39:11 +0530 Subject: [PATCH] NTP-7772 | KYC Incident | Cache API OnCreate | Policy Details Screen UI Fix (#13528) --- .../Navi-Insurance/network/BenefitPageApi.ts | 2 +- .../network/MarketBenefitComparePageApi.ts | 2 +- .../Navi-Insurance/network/WaitingPeriodApi.ts | 2 +- .../insuranceTab/InitScreenLifeCycleListener.kt | 4 +++- .../kyc/ui/GiAadhaarVerificationFragment.kt | 1 + .../policy/details/PolicyDetailsFragment.kt | 14 +++++++++++--- ...FooterWithCardAndSnackBarWidgetComposable.kt | 17 +++++++++++++---- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/App/Container/Navi-Insurance/network/BenefitPageApi.ts b/App/Container/Navi-Insurance/network/BenefitPageApi.ts index 85c752574d..cd264a1e92 100644 --- a/App/Container/Navi-Insurance/network/BenefitPageApi.ts +++ b/App/Container/Navi-Insurance/network/BenefitPageApi.ts @@ -68,7 +68,7 @@ export const getBenefitPageData = async ( properties: { methodName: AnalyticsFlowNameConstant.GI_RN_BENEFIT, reason: `${error.message}, axiosError: ${error.axiosCode}`, - statusCode: error.statusCode, + statusCode: error.statusCode.toString(), }, }); } diff --git a/App/Container/Navi-Insurance/network/MarketBenefitComparePageApi.ts b/App/Container/Navi-Insurance/network/MarketBenefitComparePageApi.ts index e2c96197c9..b0fe669a62 100644 --- a/App/Container/Navi-Insurance/network/MarketBenefitComparePageApi.ts +++ b/App/Container/Navi-Insurance/network/MarketBenefitComparePageApi.ts @@ -64,7 +64,7 @@ export const getMarketBenefitComparePageData = async ( properties: { methodName: AnalyticsFlowNameConstant.GI_RN_BENEFIT_COMPARE, reason: `${error.message}, axiosError: ${error.axiosCode}`, - statusCode: error.statusCode, + statusCode: error.statusCode.toString(), }, }); } diff --git a/App/Container/Navi-Insurance/network/WaitingPeriodApi.ts b/App/Container/Navi-Insurance/network/WaitingPeriodApi.ts index 5aabdde27e..6fd0ca9a24 100644 --- a/App/Container/Navi-Insurance/network/WaitingPeriodApi.ts +++ b/App/Container/Navi-Insurance/network/WaitingPeriodApi.ts @@ -64,7 +64,7 @@ export const getWaitingPeriodScreenData = async ( properties: { methodName: AnalyticsFlowNameConstant.GI_WAITING_PERIOD, reason: `${error.message}, axiosError: ${error.axiosCode}`, - statusCode: error.statusCode, + statusCode: error.statusCode.toString(), }, }); } diff --git a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InitScreenLifeCycleListener.kt b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InitScreenLifeCycleListener.kt index b2e75277ff..d78343dcf8 100644 --- a/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InitScreenLifeCycleListener.kt +++ b/android/app/src/main/java/com/naviapp/home/dashboard/ui/compose/insuranceTab/InitScreenLifeCycleListener.kt @@ -23,9 +23,11 @@ fun InitScreenLifeCycleListener(activity: HomePageActivity, viewmodel: Insurance DisposableEffect(key1 = lifecycleOwner) { val observer = LifecycleEventObserver { _, event -> when (event) { + Lifecycle.Event.ON_CREATE -> { + viewmodel.clearCacheOnVersionUpgrade() + } Lifecycle.Event.ON_RESUME -> { viewmodel.fetchInsuranceTabDetails() - viewmodel.clearCacheOnVersionUpgrade() viewmodel.observeCtaData( viewmodel = viewmodel, activity = activity, diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/kyc/ui/GiAadhaarVerificationFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/kyc/ui/GiAadhaarVerificationFragment.kt index c7d18fddfc..0c667b19d9 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/kyc/ui/GiAadhaarVerificationFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/kyc/ui/GiAadhaarVerificationFragment.kt @@ -423,6 +423,7 @@ class GiAadhaarVerificationFragment : GiBaseFragment(), OKYCListener { analyticsEventTracker.okycFailed( mapOf( Pair("error_code", error.errorCode.toString()), + Pair("message", error.message.toString()), Pair("error_message", error.errorMessage), Pair("screen", screenName) ) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt index a77525d11c..096485c303 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/policy/details/PolicyDetailsFragment.kt @@ -116,17 +116,25 @@ class PolicyDetailsFragment : BaseFragment(), WidgetCallback { modifier = Modifier.fillMaxSize().background(color = Color.White), topBar = { data.headerNativeWidget?.getOrNull(0)?.let { data -> - GenericComposableWidgetFactory(data = data, this, isFirstItemVisible) + Box(modifier = Modifier.background(color = Color.White)) { + GenericComposableWidgetFactory( + data = data, + this@PolicyDetailsFragment, + isFirstItemVisible + ) + } } }, bottomBar = { data.footerNativeWidget?.getOrNull(0)?.let { data -> - GenericComposableWidgetFactory(data = data, this) + Box(modifier = Modifier.background(color = Color.White)) { + GenericComposableWidgetFactory(data = data, this@PolicyDetailsFragment) + } } } ) { paddingValues -> CompositionLocalProvider(LocalOverscrollConfiguration provides null) { - Box(modifier = Modifier.padding(paddingValues)) { + Box(modifier = Modifier.padding(paddingValues).background(color = Color.White)) { LazyColumn( modifier = Modifier.fillMaxWidth().wrapContentHeight(), state = listState diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/composewidget/widgets/FooterWithCardAndSnackBarWidgetComposable.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/composewidget/widgets/FooterWithCardAndSnackBarWidgetComposable.kt index ca851bf701..d57a1c5c1b 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/composewidget/widgets/FooterWithCardAndSnackBarWidgetComposable.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/composewidget/widgets/FooterWithCardAndSnackBarWidgetComposable.kt @@ -26,7 +26,6 @@ import com.navi.naviwidgets.callbacks.WidgetCallback import com.navi.naviwidgets.composewidget.reusable.FooterButtonComposable import com.navi.naviwidgets.composewidget.reusable.FooterCardComposable import com.navi.naviwidgets.composewidget.reusable.FooterSnackbarComposable -import com.navi.naviwidgets.composewidget.reusable.colorShadow import com.navi.naviwidgets.composewidget.reusable.whiteColor import com.navi.naviwidgets.extensions.NaviTextWidgetized import com.navi.naviwidgets.models.FooterButtonState @@ -53,15 +52,25 @@ fun FooterWithCardAndSnackBarWidgetComposable( FooterSnackbarComposable(data = data.footerWithCardAndSnackbarWidgetBody?.snackBarInfo) Column(modifier = Modifier.fillMaxWidth()) { if ( - data.footerWithCardAndSnackbarWidgetBody?.cardInfo.isNotNull() || - data.footerWithCardAndSnackbarWidgetBody?.errorCardInfo.isNotNull() + (data.footerWithCardAndSnackbarWidgetBody?.cardInfo.isNotNull() || + data.footerWithCardAndSnackbarWidgetBody?.errorCardInfo.isNotNull()) && + (data.footerWithCardAndSnackbarWidgetBody + ?.footerButton + ?.title + ?.text + .isNotNull() || + data.footerWithCardAndSnackbarWidgetBody + ?.secondaryFooterButton + ?.title + ?.text + .isNotNull()) ) { Box( modifier = Modifier.background( brush = Brush.verticalGradient( - colors = listOf(Color.Transparent, colorShadow) + colors = listOf(Color.Transparent, Color.LightGray) ), shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp) )