varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TP-49412 | PS | fixed signal api handling (#8747)

Browse Source
This commit is contained in:
Prakhar Saxena
2023-11-27 11:30:04 +05:30
committed by GitHub
parent 472914804c
commit 8ee6f5b0da
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
navi-amc/src/main/java/com/navi/amc/common/activity/BasePaymentActivity.kt
View File

@@ -20,6 +20,7 @@ import com.navi.common.utils.CommonNaviAnalytics
import com.navi.common.utils.Constants
import com.navi.common.utils.getErrorData
import com.navi.common.utils.getNetworkType
import com.navi.payment.base.PaymentManager
import com.navi.payment.model.PostPaymentData
import com.navi.payment.razorpay.RazorpayHelper
import com.navi.payment.utils.PaymentAnalytics
@@ -38,6 +39,7 @@ abstract class BasePaymentActivity :
AmcBaseActivity(), PaymentResultWithDataListener, CFCheckoutResponseCallback {
val sharedVM by viewModels<PaymentSharedVM>()
private val paymentVM by viewModels<PaymentManager>()
abstract override val screenName: String
abstract override val moduleName: ModuleNameV2
private var provider: Any? = null

6
navi-amc/src/main/java/com/navi/amc/common/fragment/OrderStatusFragment.kt
View File

@@ -78,7 +78,7 @@ class OrderStatusFragment : AmcBaseFragment(), FooterInteractionListener, BackLi
CsatCompletionListener, WidgetCallback {
private lateinit var binding: OrderStatusLayoutBinding
private val viewModel by viewModels<OrderStatusViewModel>()
private val paymentVM: PaymentManager by viewModels()
private val paymentVM: PaymentManager by activityViewModels()
private val paymentSharedVM: PaymentSharedVM by activityViewModels()
private var apiPollScheduler: ApiPollScheduler? = null
override val screenName: String
@@ -232,8 +232,10 @@ class OrderStatusFragment : AmcBaseFragment(), FooterInteractionListener, BackLi
if(it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
paymentSharedVM.syncFlowPaymentInitStartTime = System.currentTimeMillis()
sendEvent(AmcAnalytics.AMC_INIT_PAYMENT)
paymentVM.clear()
paymentVM.init(
it?.tokenDetails?.naviSdkToken!!, requireActivity(),
it?.tokenDetails?.naviSdkToken!!,
requireActivity(),
(requireActivity() as? PaymentListener)
)
}

3
navi-amc/src/main/java/com/navi/amc/common/fragment/OtpFragment.kt
View File

@@ -78,7 +78,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener {
private lateinit var binding: OtpFragmentAmcBinding
private val viewModel by viewModels<OTPVM>()
private val paymentVM: PaymentManager by viewModels()
private val paymentVM: PaymentManager by activityViewModels()
private val paymentSharedVM: PaymentSharedVM by activityViewModels()
private var timer: CountDownTimer? = null
private var apiCallLastTime: Long = 0
@@ -215,6 +215,7 @@ class OtpFragment : AmcBaseFragment(), View.OnClickListener {
if(it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
paymentSharedVM.syncFlowPaymentInitStartTime = System.currentTimeMillis()
sendEvent(AmcAnalytics.AMC_INIT_PAYMENT)
paymentVM.clear()
paymentVM.init(
it?.tokenDetails?.naviSdkToken!!,
requireActivity(),

3
navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/AutoPaySetupFragment.kt
View File

@@ -52,7 +52,7 @@ import dagger.hilt.android.AndroidEntryPoint
class AutoPaySetupFragment() : AmcBaseFragment(), FooterInteractionListener {
private lateinit var binding: AutoPaySetupScreenLayoutBinding
private val viewModel by viewModels<AutoPaySetupViewModel>()
private val paymentVM: PaymentManager by viewModels()
private val paymentVM: PaymentManager by activityViewModels()
private val paymentSharedVM: PaymentSharedVM by activityViewModels()
override val screenName: String
get() = AUTO_PAY_SETUP
@@ -167,6 +167,7 @@ class AutoPaySetupFragment() : AmcBaseFragment(), FooterInteractionListener {
if(it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
paymentSharedVM.syncFlowPaymentInitStartTime = System.currentTimeMillis()
sendEvent(AmcAnalytics.AMC_INIT_PAYMENT)
paymentVM.clear()
paymentVM.init(
it?.tokenDetails?.naviSdkToken!!,
requireActivity(),

3
navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundBuyingFragmentV2.kt
View File

@@ -83,7 +83,7 @@ class FundBuyingFragmentV2 : AmcBaseFragment(), WidgetCallback {
private lateinit var binding: FragmentFundBuyingV2Binding
private val viewModel by viewModels<FundBuyV2ViewModel>()
private val paymentVM: PaymentManager by viewModels()
private val paymentVM: PaymentManager by activityViewModels()
private val paymentSharedVM: PaymentSharedVM by activityViewModels()
private var confinedInvestmentType: String = AmcAnalytics.SIP_AND_LUMPSUM
private var isin: String? = null
@@ -559,6 +559,7 @@ class FundBuyingFragmentV2 : AmcBaseFragment(), WidgetCallback {
if(it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
paymentSharedVM.syncFlowPaymentInitStartTime = System.currentTimeMillis()
sendEvent(AmcAnalytics.AMC_INIT_PAYMENT)
paymentVM.clear()
paymentVM.init(
it?.tokenDetails?.naviSdkToken!!,
requireActivity(),

3
navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/PaymentSummaryFragment.kt
View File

@@ -60,7 +60,7 @@ import java.text.DecimalFormat
class PaymentSummaryFragment : AmcBaseFragment() {
private lateinit var binding: PaymentSummaryLayoutBinding
private val viewModel by viewModels<PaymentSummaryViewModel>()
private val paymentVM: PaymentManager by viewModels()
private val paymentVM: PaymentManager by activityViewModels()
private val paymentSharedVM: PaymentSharedVM by activityViewModels()
override val screenName: String
get() = PAYMENT_INIT_SUMMARY
@@ -390,6 +390,7 @@ class PaymentSummaryFragment : AmcBaseFragment() {
if(it?.tokenDetails?.naviSdkToken.isNotNullAndNotEmpty()) {
paymentSharedVM.syncFlowPaymentInitStartTime = System.currentTimeMillis()
sendEvent(AmcAnalytics.AMC_INIT_PAYMENT)
paymentVM.clear()
paymentVM.init(
it?.tokenDetails?.naviSdkToken!!,
requireActivity(),