From ff42856aff371cc43d5dbe287e193b13358f8513 Mon Sep 17 00:00:00 2001 From: Sangaraboina Rishvik Vardhan Date: Wed, 8 May 2024 17:16:15 +0530 Subject: [PATCH] TP-62431 | Bugfixes (#10751) --- .../health/activity/InsuranceContainerActivity.kt | 4 ++-- .../autopayoption/ui/PaymentStatusActivity.kt | 3 ++- .../fragments/PolicyBenefitsFragment.kt | 8 +++++++- .../main/java/com/navi/insurance/util/Constants.kt | 1 + .../src/main/res/layout/toolbar_white.xml | 12 ------------ 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/InsuranceContainerActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/InsuranceContainerActivity.kt index 591b11b82d..7e1afb80c1 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/InsuranceContainerActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/health/activity/InsuranceContainerActivity.kt @@ -72,7 +72,7 @@ class InsuranceContainerActivity : GiBaseActivity(), PaymentStatusBottomSheetLis val paymentCta = viewModel.paymentRetryCta.value val amountToPay = - (paymentCta?.parameters?.find { item -> item.key == AMOUNT }?.value?:data?.getStringExtra(AMOUNT))?.toDoubleWithSafe() + paymentCta?.parameters?.find { item -> item.key == AMOUNT }?.value?.toDoubleWithSafe() ?: data?.getDoubleExtra(AMOUNT, 0.0) if (resultCode == RESULT_OK) { // Payment success, close activity finish() @@ -206,7 +206,7 @@ class InsuranceContainerActivity : GiBaseActivity(), PaymentStatusBottomSheetLis val paymentCta = viewModel.paymentRetryCta.value val amountToPay = - (paymentCta?.parameters?.find { item -> item.key == AMOUNT }?.value?:bundle?.getString(AMOUNT))?.toDoubleWithSafe() + paymentCta?.parameters?.find { item -> item.key == AMOUNT }?.value?.toDoubleWithSafe() ?: bundle?.getDouble(AMOUNT, 0.0) if (resultCode == RESULT_OK) { // Payment success, close activity finish() diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/paymentreview/autopayoption/ui/PaymentStatusActivity.kt b/android/navi-insurance/src/main/java/com/navi/insurance/paymentreview/autopayoption/ui/PaymentStatusActivity.kt index 3dc86fa8a3..aaed61d6b0 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/paymentreview/autopayoption/ui/PaymentStatusActivity.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/paymentreview/autopayoption/ui/PaymentStatusActivity.kt @@ -33,6 +33,7 @@ import com.navi.insurance.util.Constants.IS_AUTOPAY import com.navi.insurance.util.Constants.IS_INSTALMENT import com.navi.insurance.util.Constants.KEY_CTA_DATA import com.navi.insurance.util.Constants.PAYMENTS_STATUS_IS_USER_CANCELLED_EXTRA +import com.navi.insurance.util.Constants.POLL import com.navi.insurance.util.FAILURE import com.navi.insurance.util.PAYMENT_FLOW_IDENTIFIER import com.navi.insurance.util.PAYMENT_ORDER_DETAIL @@ -105,7 +106,7 @@ class PaymentStatusActivity : GiBaseActivity() { setPaymentResult(Activity.RESULT_OK, ctaData = it.data.redirectionCta) } } - FAILURE -> { + FAILURE, POLL -> { setPaymentResult(Activity.RESULT_CANCELED, false, it.data.fallbackCta) } } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt index 4f45262700..58dc10e4e5 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/quoteredesign/fragments/PolicyBenefitsFragment.kt @@ -119,7 +119,13 @@ class PolicyBenefitsFragment : BaseFragment(), WidgetCallback, View.OnClickListe POLICY_ID_EXTRA -> policyId = lineItem.value ?: "" } } - } + } ?: let{ + quoteId = arguments?.getString(QUOTE_ID_EXTRA) + planId = arguments?.getString(PLAN_ID_EXTRA) + tabId = arguments?.getString(TAB_ID_EXTRA) + benefitsType = arguments?.getString(BENEFITS_TYPE_EXTRA) + policyId = arguments?.getString(POLICY_ID_EXTRA) + } benefitsType = arguments?.getString(BENEFITS_TYPE_EXTRA) policyId = arguments?.getString(POLICY_ID_EXTRA) if(tabId.isNullOrEmpty()) tabId = arguments?.getString(TAB_ID_EXTRA) diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/util/Constants.kt b/android/navi-insurance/src/main/java/com/navi/insurance/util/Constants.kt index fd65f7539c..03795d77d7 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/util/Constants.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/util/Constants.kt @@ -325,6 +325,7 @@ object Constants { const val WIDGET_POSITION = "widgetPosition" const val UPDATED_WIDGET_DATA = "updatedWidgetData" const val FILE_NAME = "fileName" + const val POLL = "POLL" // This is required for animating a component for Health risk score val numberConstant: List = diff --git a/android/navi-insurance/src/main/res/layout/toolbar_white.xml b/android/navi-insurance/src/main/res/layout/toolbar_white.xml index 28f3e7fe53..d0b968f9d7 100644 --- a/android/navi-insurance/src/main/res/layout/toolbar_white.xml +++ b/android/navi-insurance/src/main/res/layout/toolbar_white.xml @@ -81,17 +81,5 @@ app:layout_constraintRight_toLeftOf="@id/share_btn" app:layout_constraintTop_toTopOf="parent" /> - - \ No newline at end of file