From f3bd1c3be146733ad06e15115daa4fd5f83489a9 Mon Sep 17 00:00:00 2001
From: Apoorv Nigam <apoorv.nigam@navi.com>
Date: Mon, 10 Jun 2024 13:24:46 +0530
Subject: [PATCH] TP-67819 | AMC Turbocheckout fix (#11213)

---
 .../java/com/navi/amc/common/activity/CheckerActivity.kt    | 6 +++---
 .../main/java/com/navi/amc/common/fragment/OtpFragment.kt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/activity/CheckerActivity.kt b/android/navi-amc/src/main/java/com/navi/amc/common/activity/CheckerActivity.kt
index 55c0f5ea2c..a693a251bc 100644
--- a/android/navi-amc/src/main/java/com/navi/amc/common/activity/CheckerActivity.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/common/activity/CheckerActivity.kt
@@ -17,8 +17,8 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.LinearLayout
 import androidx.activity.viewModels
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.updateLayoutParams
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.lifecycleScope
@@ -117,9 +117,9 @@ class CheckerActivity : BasePaymentActivity() {
             intent.getStringExtra(FLOW_TYPE) in
                 listOf(OTP_FLOW_TYPE_SIP_MANUAL, OTP_FLOW_TYPE_SIP_AUTOPAY)
         ) {
-            binding.loaderView.updateLayoutParams<LinearLayout.LayoutParams> {
-                width = dpToPxInInt(148)
+            binding.loaderView.updateLayoutParams<ConstraintLayout.LayoutParams> {
                 height = dpToPxInInt(148)
+                width = dpToPxInInt(148)
             }
             binding.loaderView.setAnimation(com.navi.naviwidgets.R.raw.calendar_flip)
             val jsonString: String =
diff --git a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt
index f947fa0485..5c098e904a 100644
--- a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt
@@ -230,7 +230,6 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener {
         }
 
         viewModel.paymentInitiateData.observe(viewLifecycleOwner) {
-            popThisFromBackStack()
             sendEvent(
                 AmcAnalytics.AMC_PAYMENT_TOKEN_RECEIVED,
                 hashMapOf(
@@ -241,6 +240,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener {
             )
             if (it?.isTurboCheckoutFlow.orFalse()) {
                 if (it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
+                    popThisFromBackStack()
                     val paymentSdkInitParams =
                         PaymentSdkInitParams(
                             token = it?.tokenDetails?.naviSdkToken!!,