diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/activity/NaviPaymentActivity.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/activity/NaviPaymentActivity.kt
index d5b6da3ffa..06a5846580 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/activity/NaviPaymentActivity.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/activity/NaviPaymentActivity.kt
@@ -19,7 +19,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.navi.common.model.ModuleNameV2
import com.navi.common.ui.activity.BaseActivity
import com.navi.pay.common.theme.NaviPayMaterialTheme
-import com.navi.payment.nativepayment.model.NaviPaymentScreenType
+import com.navi.payment.R
import com.navi.payment.nativepayment.router.NaviPaymentRouter
import com.navi.payment.nativepayment.screens.NaviPaymentMainScreen
import com.navi.payment.nativepayment.viewmodel.PaymentViewModel
@@ -44,6 +44,7 @@ class NaviPaymentActivity : BaseActivity() {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
}
super.onCreate(savedInstanceState)
+ overridePendingTransition(R.anim.fade_in, 0)
setContent {
val customerStatusRoute = NaviPaymentRouter.getRouteFromCtaUrl(viewModel.getScreenType())
NaviPayMaterialTheme {
diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/MPSScreen.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/MPSScreen.kt
index 482c7d2772..a5984738c3 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/MPSScreen.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/MPSScreen.kt
@@ -390,7 +390,6 @@ fun MPSScreen(
}
is MPSScreenUtils.MPSScreenType.NonOnboarded -> {
- sendLatencyEvent(paymentViewModel)
MPSNonOnboardedView(
mainCtaState = mainCtaState,
paymentAmount = paymentAmount,
@@ -401,10 +400,10 @@ fun MPSScreen(
onOtherMethodsClick = onOtherMethodsClick,
onDismissClicked = onBackClick
)
+ sendLatencyEvent(paymentViewModel)
}
is MPSScreenUtils.MPSScreenType.Onboarded -> {
- sendLatencyEvent(paymentViewModel)
MPSOnboardedView(
mainCtaState = mainCtaState,
paymentAmount = paymentAmount,
@@ -419,6 +418,7 @@ fun MPSScreen(
onBankAccountSelected = onBankAccountSelected,
onDismissClicked = onBackClick
)
+ sendLatencyEvent(paymentViewModel)
}
is MPSScreenUtils.MPSScreenType.Feedback -> {
@@ -439,7 +439,6 @@ fun MPSScreen(
}
is MPSScreenUtils.MPSScreenType.Error -> {
- sendLatencyEvent(paymentViewModel)
val errorData =
(bottomSheetStateHolder.bottomSheetUIState as MPSScreenUtils.MPSScreenType.Error).errorData
paymentViewModel.sendEvent(
@@ -459,7 +458,6 @@ fun MPSScreen(
secondaryButtonText = if (errorData?.feedbackConfig.isNotNull()) "Report an issue" else "Cancel",
onPrimaryButtonClicked = {
onOtherMethodsClick()
- onBackClick()
},
onSecondaryButtonClicked = {
if (errorData?.feedbackConfig.isNotNull()) {
@@ -475,6 +473,7 @@ fun MPSScreen(
},
onDismissClicked = onBackClick
)
+ sendLatencyEvent(paymentViewModel)
}
}
}
diff --git a/android/navi-payment/src/main/res/anim/fade_in.xml b/android/navi-payment/src/main/res/anim/fade_in.xml
new file mode 100644
index 0000000000..9dc28ae304
--- /dev/null
+++ b/android/navi-payment/src/main/res/anim/fade_in.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file
diff --git a/android/navi-payment/src/main/res/anim/fade_out.xml b/android/navi-payment/src/main/res/anim/fade_out.xml
new file mode 100644
index 0000000000..8bb3844af9
--- /dev/null
+++ b/android/navi-payment/src/main/res/anim/fade_out.xml
@@ -0,0 +1,7 @@
+
+
+
+
\ No newline at end of file