diff --git a/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt b/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt index de9050d85e..4cef7121de 100644 --- a/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt +++ b/navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt @@ -174,7 +174,9 @@ class OrderStatusFragment : AmcBaseFragment(), FooterInteractionListener, BackLi } } viewModel.createOrderResponse.observe(viewLifecycleOwner) { - apiPollInit(it) + if(it?.requestId.isNotNullAndNotEmpty()) { + apiPollInit(it) + } } viewModel.asyncResponse.observe(viewLifecycleOwner) { onPollingResponse(it) diff --git a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt index 4f468778a7..d5950216ef 100644 --- a/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt +++ b/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundListingFragmentV2.kt @@ -245,10 +245,10 @@ class FundListingFragmentV2 : AmcBaseFragment(), WidgetCallback { navigateToNextScreen(naviClickAction.actionData) } is ActionData -> { - if (naviClickAction.url?.contains(Constants.PAGE_REFRESH) + if (naviClickAction.url?.equals(Constants.PAGE_REFRESH) .orFalse() ) { - fetchData(showLoader = true) + fetchData(showLoader = true, forceRefresh = true) } else if (naviClickAction.url?.contains(Constants.ACTION_TYPE_FORCE_PAGE_REFRESH) .orFalse() ) {