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

NTP-17710 | Added Regression fix #13977 (#13978)

Browse Source 
Co-authored-by: Aman <amankasyapp@gmail.com>
This commit is contained in:
Aman S
2024-12-05 16:24:20 +05:30
committed by GitHub
parent 6da8b6492f
commit 998f66ea70
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
android/navi-amc/src/main/java/com/navi/amc/common/activity/CheckerActivity.kt
View File

@@ -36,7 +36,8 @@ import com.navi.amc.databinding.CheckerActivityAmcBinding
import com.navi.amc.fundbuy.models.SipDetailsData
import com.navi.amc.navigator.NaviAmcDeeplinkNavigator
import com.navi.amc.portfolio.models.ModifySipRequestDetails
import com.navi.amc.utils.*
import com.navi.amc.utils.ActivityRequestCode
import com.navi.amc.utils.AmcAnalytics
import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_ESIGN_CALLBACK_TIME
import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_KYC_CALLBACK_TIME
import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_MANDATE_CALLBACK_TIME
@@ -46,6 +47,7 @@ import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_PAYMENT_CALLBACK_TIME
import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_PAYMENT_INITIATION_TIME
import com.navi.amc.utils.AmcAnalytics.AMC_LATENCY_PENNY_DROP_TIME
import com.navi.amc.utils.AmcAnalytics.POLLING_TIMEOUT
import com.navi.amc.utils.Constant
import com.navi.amc.utils.Constant.AUTOPAY_TYPE
import com.navi.amc.utils.Constant.AUTO_PAY_CALLBACK_ERROR
import com.navi.amc.utils.Constant.CHECKER_DATA
@@ -59,11 +61,16 @@ import com.navi.amc.utils.Constant.PAYMENT_CALLBACK_ERROR
import com.navi.amc.utils.Constant.REQUEST_CONFIG
import com.navi.amc.utils.Constant.SIP_REFERENCE_ID
import com.navi.amc.utils.Constant.TRANSACTION_ID
import com.navi.amc.utils.SubPageStatusType
import com.navi.amc.utils.TempStorageHelper
import com.navi.amc.utils.amcDeeplink
import com.navi.amc.utils.getAutopayErrorData
import com.navi.amc.utils.getJsonObject
import com.navi.amc.utils.orValue
import com.navi.amc.utils.toNavigateAmcModule
import com.navi.base.model.ActionData
import com.navi.base.model.CtaData
import com.navi.base.model.LineItem
import com.navi.base.utils.FAILURE
import com.navi.base.utils.SUCCESS
import com.navi.base.utils.isNotNull
import com.navi.base.utils.isNotNullAndNotEmpty
import com.navi.base.utils.orFalse
@@ -74,8 +81,14 @@ import com.navi.common.model.RequestConfig
import com.navi.common.network.models.GenericErrorResponse
import com.navi.common.network.models.RepoResult
import com.navi.common.pushnotification.NotificationConstants
import com.navi.common.utils.*
import com.navi.common.utils.ApiPollScheduler
import com.navi.common.utils.ApiPollScheduler.Companion.API_POLL_REPEAT_PERIOD_SECONDS
import com.navi.common.utils.CommonNaviAnalytics
import com.navi.common.utils.Constants
import com.navi.common.utils.EMPTY
import com.navi.common.utils.getNetworkType
import com.navi.common.utils.observeNonNull
import com.navi.common.utils.toActionData
import com.navi.design.utils.dpToPxInInt
import com.navi.design.utils.setSpannableString
import com.navi.naviwidgets.models.response.amc.PaymentCardData.Companion.PAYMENT_CARD_ID
@@ -950,7 +963,7 @@ class CheckerActivity : BasePaymentActivity() {
const val TYPE = "TYPE"
const val ERROR_TAG = "ERROR_TAG"
const val STATUS = "status"
const val SUCCESS = "success"
const val FAILURE = "failure"
const val SUCCESS = "SUCCESS"
const val FAILURE = "FAILURE"
}
}

6
android/navi-amc/src/main/java/com/navi/amc/fundbuy/viewmodel/FundBuyFlowViewModel.kt
View File

@@ -56,8 +56,7 @@ class FundBuyFlowViewModel @Inject constructor() : BaseAmcVM() {
}
} else {
action.invoke(SPECIAL_STATE)
if (fragmentStack.isEmpty()) return
fragmentStack.removeLast()
removeLastScreen()
}
}
@@ -66,7 +65,8 @@ class FundBuyFlowViewModel @Inject constructor() : BaseAmcVM() {
}
fun removeLastScreen() {
fragmentStack.removeLast()
if (fragmentStack.isEmpty()) return
fragmentStack.removeAt(fragmentStack.size - 1)
}
private fun returnIndex(): Int {