diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt index d088609424..403ae591f1 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreenV2.kt @@ -1555,13 +1555,7 @@ private fun SharedTransitionScope.ScratchCardOnLandSection( horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_card_christmas_celebration_with_coin - else CommonR.drawable.ic_np_scratch_card_with_coin - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin), contentDescription = "", modifier = Modifier.alpha(alpha) @@ -1939,24 +1933,12 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( ), ) { Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_christmas_celebration_stripe - else CommonR.drawable.ic_np_scratch_stripe - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_stripe), contentDescription = EMPTY, ) } Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_card_christmas_celebration_with_coin - else CommonR.drawable.ic_np_scratch_card_with_coin - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin), contentDescription = EMPTY, modifier = Modifier.padding(start = 20.dp, bottom = 8.dp) diff --git a/android/navi-common/src/main/res/drawable/ic_np_scratch_card_christmas_celebration_with_coin.xml b/android/navi-common/src/main/res/drawable/ic_np_scratch_card_christmas_celebration_with_coin.xml deleted file mode 100644 index ea31b4a555..0000000000 --- a/android/navi-common/src/main/res/drawable/ic_np_scratch_card_christmas_celebration_with_coin.xml +++ /dev/null @@ -1,1703 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/navi-common/src/main/res/drawable/ic_np_scratch_christmas_celebration_stripe.xml b/android/navi-common/src/main/res/drawable/ic_np_scratch_christmas_celebration_stripe.xml deleted file mode 100644 index 4043226f6d..0000000000 --- a/android/navi-common/src/main/res/drawable/ic_np_scratch_christmas_celebration_stripe.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/navi-pay/src/main/assets/navi-pay-payment-christmas-celebration-loader.lottie b/android/navi-pay/src/main/assets/navi-pay-payment-christmas-celebration-loader.lottie deleted file mode 100644 index bfb0431c94..0000000000 Binary files a/android/navi-pay/src/main/assets/navi-pay-payment-christmas-celebration-loader.lottie and /dev/null differ diff --git a/android/navi-pay/src/main/assets/navi-pay-payment-successful-christmas-celebration.lottie b/android/navi-pay/src/main/assets/navi-pay-payment-successful-christmas-celebration.lottie deleted file mode 100644 index f9b536f087..0000000000 Binary files a/android/navi-pay/src/main/assets/navi-pay-payment-successful-christmas-celebration.lottie and /dev/null differ diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt index 8a00cd8997..e8372ffc90 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreen.kt @@ -112,7 +112,6 @@ fun PaymentSummaryScreen( NaviPayAnalytics.INSTANCE.NaviPayPaymentSummary(), orderReferenceId: String, transactionCompletionTime: Long, - isChristmasCelebrationExperimentEnabled: Boolean, ) { val lifecycleOwner = LocalLifecycleOwner.current @@ -460,8 +459,6 @@ fun PaymentSummaryScreen( paymentSummaryViewModel.scratchCardBottomMovementAnimationDuration, shouldPlayScratchAndWinCtaAnimation = shouldPlayScratchAndWinCtaAnimation, - isChristmasCelebrationExperimentEnabled = - isChristmasCelebrationExperimentEnabled, ) } } @@ -476,8 +473,6 @@ fun PaymentSummaryScreen( smallScratchCardOnLandVisibilityAnimationDuration = paymentSummaryViewModel .smallScratchCardOnLandVisibilityAnimationDuration, - isChristmasCelebrationExperimentEnabled = - isChristmasCelebrationExperimentEnabled, ) } } @@ -493,7 +488,6 @@ private fun SharedTransitionScope.ScratchCardOnLandSection( scratchCardSizeAnimationDuration: Int, scratchCardBottomMovementAnimationDuration: Int, smallScratchCardOnLandVisibilityAnimationDuration: Int, - isChristmasCelebrationExperimentEnabled: Boolean, ) { var isScratchCardFullyVisible by remember { mutableStateOf(false) } LaunchedEffect(Unit) { isScratchCardFullyVisible = true } @@ -524,13 +518,7 @@ private fun SharedTransitionScope.ScratchCardOnLandSection( horizontalAlignment = Alignment.CenterHorizontally, ) { Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_card_christmas_celebration_with_coin - else CommonR.drawable.ic_np_scratch_card_with_coin - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin), contentDescription = "", modifier = Modifier.alpha(alpha) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryTransactionDetailSection.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryTransactionDetailSection.kt index e2f2110315..d01bd21c81 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryTransactionDetailSection.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryTransactionDetailSection.kt @@ -121,7 +121,6 @@ fun SharedTransitionScope.PaymentSummaryTransactionDetailSection( rewardsBottomStripeSectionAnimationDuration: Int, scratchCardBottomMovementAnimationDuration: Int, shouldPlayScratchAndWinCtaAnimation: Boolean, - isChristmasCelebrationExperimentEnabled: Boolean, ) { val onViewDetailCtaClicked = { @@ -222,7 +221,6 @@ fun SharedTransitionScope.PaymentSummaryTransactionDetailSection( scratchCardBottomMovementAnimationDuration = scratchCardBottomMovementAnimationDuration, shouldPlayScratchAndWinCtaAnimation = shouldPlayScratchAndWinCtaAnimation, - isChristmasCelebrationExperimentEnabled = isChristmasCelebrationExperimentEnabled, ) }, ) @@ -245,7 +243,6 @@ private fun SharedTransitionScope.BottomBarSection( rewardsBottomStripeSectionAnimationDuration: Int, scratchCardBottomMovementAnimationDuration: Int, shouldPlayScratchAndWinCtaAnimation: Boolean, - isChristmasCelebrationExperimentEnabled: Boolean, ) { Column(modifier = Modifier.padding(top = 16.dp)) { if (isRewardsCtaVisible) { @@ -260,7 +257,6 @@ private fun SharedTransitionScope.BottomBarSection( rewardsBottomStripeSectionAnimationDuration, scratchCardBottomMovementAnimationDuration = scratchCardBottomMovementAnimationDuration, - isChristmasCelebrationExperimentEnabled = isChristmasCelebrationExperimentEnabled, ) } Spacer(modifier = Modifier.height(16.dp)) @@ -329,7 +325,6 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( scratchCardRotationAnimationDuration: Int, rewardsBottomStripeSectionAnimationDuration: Int, scratchCardBottomMovementAnimationDuration: Int, - isChristmasCelebrationExperimentEnabled: Boolean, ) { val colorStops = remember { arrayOf( @@ -429,24 +424,12 @@ private fun SharedTransitionScope.RewardsBottomBarWithStripSection( ), ) { Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_christmas_celebration_stripe - else CommonR.drawable.ic_np_scratch_stripe - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_stripe), contentDescription = "", ) } Image( - painter = - painterResource( - id = - if (isChristmasCelebrationExperimentEnabled) - CommonR.drawable.ic_np_scratch_card_christmas_celebration_with_coin - else CommonR.drawable.ic_np_scratch_card_with_coin - ), + painter = painterResource(id = CommonR.drawable.ic_np_scratch_card_with_coin), contentDescription = "", modifier = Modifier.padding(start = 20.dp, bottom = 8.dp) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyScreen.kt index f17abf3aa0..e1c1d4fb0b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/ui/SendMoneyScreen.kt @@ -79,9 +79,7 @@ import com.navi.pay.utils.INTENT_OR_SCAN_PAY_TRANSACTION_ERROR import com.navi.pay.utils.INVALID_VPA import com.navi.pay.utils.LINKED_ACCOUNT_SCREEN_SOURCE import com.navi.pay.utils.NAVI_PAY_COIN_LOADER_LOTTIE -import com.navi.pay.utils.NAVI_PAY_PAYMENT_PROGRESS_CHRISTMAS_CELEBRATION_LOTTIE import com.navi.pay.utils.NAVI_PAY_PAYMENT_PROGRESS_LOTTIE -import com.navi.pay.utils.NAVI_PAY_PAYMENT_SUCCESSFUL_CHRISTMAS_CELEBRATION_LOTTIE import com.navi.pay.utils.NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V3 import com.navi.pay.utils.PSP_DOWN import com.navi.pay.utils.QR_ERROR @@ -611,18 +609,13 @@ private fun LoadingStatesView( sendMoneyViewModel.isProcessingTextVisible.collectAsStateWithLifecycle() val lottieBackgroundColor by sendMoneyViewModel.lottieBackgroundColor.collectAsStateWithLifecycle() - val isChristmasCelebrationExperimentEnabled by - sendMoneyViewModel.isChristmasCelebrationExperimentEnabled.collectAsStateWithLifecycle() when (screenState) { is SendMoneyScreenState.PaymentInProgressPrePinInput -> { PaymentProgressAnimation(paymentAmount = paymentAmount.text) } is SendMoneyScreenState.PaymentInProgressPostPinInput -> { - PaymentProgressAnimationV2( - isChristmasCelebrationExperimentEnabled = isChristmasCelebrationExperimentEnabled, - paymentAmount = paymentAmount.text, - ) + PaymentProgressAnimationV2(paymentAmount = paymentAmount.text) } is SendMoneyScreenState.PaymentSuccess -> { AlfredManager.setCurrentScreenName( @@ -642,7 +635,6 @@ private fun LoadingStatesView( NaviPayMediaPlayer(activityRef = WeakReference(naviPayActivity)) } RenderPaymentSuccessState( - isChristmasCelebrationExperimentEnabled = isChristmasCelebrationExperimentEnabled, navigator = navigator, screenState = screenState, sendMoneyViewModel = sendMoneyViewModel, @@ -697,7 +689,6 @@ private fun LoadingStatesView( @Composable private fun RenderPaymentSuccessState( - isChristmasCelebrationExperimentEnabled: Boolean, navigator: DestinationsNavigator, screenState: SendMoneyScreenState.PaymentSuccess, sendMoneyViewModel: SendMoneyViewModel, @@ -709,10 +700,7 @@ private fun RenderPaymentSuccessState( returnToSourceApp: () -> Unit, ) { NaviPayLottieAnimationV2( - lottieFileName = - if (isChristmasCelebrationExperimentEnabled) - NAVI_PAY_PAYMENT_SUCCESSFUL_CHRISTMAS_CELEBRATION_LOTTIE - else NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V3, + lottieFileName = NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V3, onAnimationEnd = { if ( sendMoneyViewModel.redirectToSourceOnIntentPaymentSuccess && @@ -727,8 +715,6 @@ private fun RenderPaymentSuccessState( isTransactionEligibleForNpsComms = screenState.isTransactionEligibleForNpsComms, orderReferenceId = screenState.orderReferenceId, transactionCompletionTime = screenState.transactionCompletionTime, - isChristmasCelebrationExperimentEnabled = - isChristmasCelebrationExperimentEnabled, ) } sendMoneyViewModel.resetLottieSpecs() @@ -764,17 +750,11 @@ private fun PaymentProgressAnimation(paymentAmount: String) { } @Composable -private fun PaymentProgressAnimationV2( - isChristmasCelebrationExperimentEnabled: Boolean, - paymentAmount: String, -) { +private fun PaymentProgressAnimationV2(paymentAmount: String) { val title = stringResource(id = R.string.payment_in_progress_v2, paymentAmount.getDisplayableAmount()) FullScreenLottieV2( - lottieFileName = - if (isChristmasCelebrationExperimentEnabled) - NAVI_PAY_PAYMENT_PROGRESS_CHRISTMAS_CELEBRATION_LOTTIE - else NAVI_PAY_PAYMENT_PROGRESS_LOTTIE, + lottieFileName = NAVI_PAY_PAYMENT_PROGRESS_LOTTIE, title = title, lottieSize = 230.dp, ) @@ -794,7 +774,6 @@ private fun goToPaymentSummaryScreen( isTransactionEligibleForNpsComms: Boolean, orderReferenceId: String, transactionCompletionTime: Long, - isChristmasCelebrationExperimentEnabled: Boolean, ) { navigator.clearBackStackUpToAndNavigate( destination = @@ -803,7 +782,6 @@ private fun goToPaymentSummaryScreen( isTransactionEligibleForNpsComms = isTransactionEligibleForNpsComms, orderReferenceId = orderReferenceId, transactionCompletionTime = transactionCompletionTime, - isChristmasCelebrationExperimentEnabled = isChristmasCelebrationExperimentEnabled, ), popUpTo = NavGraphs.root, inclusive = false, diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt index 73bc8b5893..50214f96e7 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/sendmoney/viewmodel/SendMoneyViewModel.kt @@ -40,7 +40,6 @@ import com.navi.common.upi.METADATA import com.navi.common.upi.PAYER_BANK_ACCOUNT_ID import com.navi.common.upi.SOURCE_SCREEN_NAME import com.navi.common.upi.T_STORE_ORDER_REFERENCE_ID -import com.navi.common.usecase.LitmusExperimentsUseCase import com.navi.common.utils.Constants.UNDERSCORE import com.navi.common.utils.EMPTY import com.navi.common.utils.SPACE @@ -158,7 +157,6 @@ import com.navi.pay.utils.INTENT_OR_SCAN_PAY_TRANSACTION_ERROR import com.navi.pay.utils.INVALID_VPA import com.navi.pay.utils.KEY_IS_FIRST_TRANSACTION_SUCCESSFUL import com.navi.pay.utils.LITE_MAX_SEND_MONEY -import com.navi.pay.utils.LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION import com.navi.pay.utils.NAVI_AXIS_UPI_HANDLE import com.navi.pay.utils.NAVI_PAY_OF_TYPE_INTENT_TRANSACTION import com.navi.pay.utils.NAVI_PAY_PURPLE_CTA_LOADER_LOTTIE @@ -250,7 +248,6 @@ constructor( private val upiLiteExperimentationUseCase: UpiLiteExperimentationUseCase, private val upiLiteCommsAndMandateExecutionHandler: UpiLiteCommsAndMandateExecutionHandler, val accountListCheckBalanceUseCase: AccountListCheckBalanceUseCase, - private val litmusExperimentsUseCase: LitmusExperimentsUseCase, private val sendMoneyUseCase: SendMoneyUseCase, naviPayActivityDataProvider: NaviPayActivityDataProvider, ) : NaviPayBaseVM() { @@ -527,10 +524,6 @@ constructor( private val isLiteAutoTopUpExperimentEnabled = MutableStateFlow(false) - private val _isChristmasCelebrationExperimentEnabled = MutableStateFlow(false) - val isChristmasCelebrationExperimentEnabled = - _isChristmasCelebrationExperimentEnabled.asStateFlow() - private val appliedConfeeDetails = MutableStateFlow>(emptyList()) private val startPaymentJobReference = AtomicReference() @@ -551,13 +544,6 @@ constructor( isLiteAutoTopUpExperimentEnabled.update { upiLiteExperimentationUseCase.getAutoTopExperimentData().isAutoTopUpEnabled == true } - - _isChristmasCelebrationExperimentEnabled.update { - litmusExperimentsUseCase - .execute(experimentName = LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION) - ?.variant - ?.enabled == true - } } } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt index 18fe2adbb5..8ab43e880a 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt @@ -50,16 +50,12 @@ const val NAVI_PAY_FAIL_LOTTIE = "navi-pay-failed.lottie" const val NAVI_PAY_PENDING_LOTTIE = "navi-pay-pending.lottie" const val NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V2 = "navi-pay-payment-successful-main-v2.lottie" const val NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V3 = "navi-pay-payment-successful-main-v3.lottie" -const val NAVI_PAY_PAYMENT_SUCCESSFUL_CHRISTMAS_CELEBRATION_LOTTIE = - "navi-pay-payment-successful-christmas-celebration.lottie" const val NAVI_PAY_PRIMARY_CTA_LOADER_LOTTIE = "navi-pay-primary-cta-loader.lottie" const val NAVI_PAY_DISABLE_UPI_LITE_SUCCESS_LOTTIE_V2 = "navi-pay-disable-upi-lite-success-v2.lottie" const val NAVI_PAY_COIN_LOADER_LOTTIE = "navi-pay-coin-loader.lottie" const val NAVI_PAY_PAYMENT_PROGRESS_LOTTIE = "navi-pay-payment-loader.lottie" -const val NAVI_PAY_PAYMENT_PROGRESS_CHRISTMAS_CELEBRATION_LOTTIE = - "navi-pay-payment-christmas-celebration-loader.lottie" const val NAVI_PAY_PURPLE_CTA_LOADER_LOTTIE = "navi-pay-purple-cta-loader.lottie" const val NAVI_PAY_GREEN_TICK_LOTTIE = "navi-pay-green-tick.lottie" const val NAVI_PAY_RECONNECT_UPI_NUMBER_LOTTIE = "navi-pay-reconnect-upi-number.lottie" @@ -175,7 +171,6 @@ const val LITMUS_EXPERIMENT_NAVIPAY_LITE_DEFAULT_ENTERED_AMOUNT = const val LITMUS_EXPERIMENT_NAVIPAY_ORDER_TAG_SUMMARY = "NaviPay-order-tag-summary" const val LITMUS_EXPERIMENT_NAVIPAY_CHECK_BALANCE_DURING_TRANSACTION = "NaviPay-exp-check-balance-during-transaction" -const val LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION = "NaviPay-exp-rwd-holiday-animation" const val LITMUS_EXPERIMENT_NAVIPAY_FREQUENT_CONTACT_IN_QR_SCANNER = "NaviPay-frequent-contact-in-qr-scanner" const val LITMUS_EXPERIMENT_NAVIPAY_SMV_BINDING = "NaviPay-exp-smv-binding" @@ -185,7 +180,6 @@ val NAVI_PAY_LITMUS_EXPERIMENTS = LITMUS_EXPERIMENT_NAVIPAY_LITE_DEFAULT_ENTERED_AMOUNT, LITMUS_EXPERIMENT_NAVIPAY_ORDER_TAG_SUMMARY, LITMUS_EXPERIMENT_NAVIPAY_CHECK_BALANCE_DURING_TRANSACTION, - LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION, LITMUS_EXPERIMENT_NAVIPAY_FREQUENT_CONTACT_IN_QR_SCANNER, LITMUS_EXPERIMENT_NAVIPAY_SMV_BINDING, ) diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/TransactionPollingScreen.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/TransactionPollingScreen.kt index 6f7394fda3..4d3093c7b8 100644 --- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/TransactionPollingScreen.kt +++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/screens/TransactionPollingScreen.kt @@ -41,9 +41,7 @@ import com.navi.pay.common.ui.FullScreenLottie import com.navi.pay.common.ui.FullScreenLottieV2 import com.navi.pay.common.ui.NaviPayLottieAnimationV2 import com.navi.pay.common.utils.NaviPayMediaPlayer -import com.navi.pay.utils.NAVI_PAY_PAYMENT_PROGRESS_CHRISTMAS_CELEBRATION_LOTTIE import com.navi.pay.utils.NAVI_PAY_PAYMENT_PROGRESS_LOTTIE -import com.navi.pay.utils.NAVI_PAY_PAYMENT_SUCCESSFUL_CHRISTMAS_CELEBRATION_LOTTIE import com.navi.pay.utils.NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V2 import com.navi.pay.utils.clearBackStackUpToAndNavigate import com.navi.pay.utils.getDisplayableAmount @@ -129,10 +127,6 @@ fun TransactionPollingScreen( NaviPayMediaPlayer(activityRef = WeakReference(naviPaymentActivity)) } - val isChristmasCelebrationExperimentEnabled by - transactionPollingViewModel.isChristmasCelebrationExperimentEnabled - .collectAsStateWithLifecycle() - val finishWithData: (statusResponse: TransactionDetails?) -> Unit = { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { naviPaymentActivity.setTranslucent(false) @@ -250,10 +244,7 @@ fun TransactionPollingScreen( FullScreenLottie(lottieFileName = "gold_processing_transaction_lottie.json") } else { FullScreenLottieV2( - lottieFileName = - if (isChristmasCelebrationExperimentEnabled) - NAVI_PAY_PAYMENT_PROGRESS_CHRISTMAS_CELEBRATION_LOTTIE - else NAVI_PAY_PAYMENT_PROGRESS_LOTTIE, + lottieFileName = NAVI_PAY_PAYMENT_PROGRESS_LOTTIE, title = stringResource( id = R.string.payment_in_progress_v2, @@ -265,10 +256,7 @@ fun TransactionPollingScreen( } is PollingScreenState.Success -> { NaviPayLottieAnimationV2( - lottieFileName = - if (isChristmasCelebrationExperimentEnabled) - NAVI_PAY_PAYMENT_SUCCESSFUL_CHRISTMAS_CELEBRATION_LOTTIE - else NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V2, + lottieFileName = NAVI_PAY_PAYMENT_SUCCESSFUL_MAIN_LOTTIE_V2, onAnimationEnd = { finishWithData.invoke((screenState as PollingScreenState.Success).data) }, diff --git a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/viewmodel/TransactionPollingViewModel.kt b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/viewmodel/TransactionPollingViewModel.kt index 612a4b4e41..b63f36b9a3 100644 --- a/android/navi-payment/src/main/java/com/navi/payment/nativepayment/viewmodel/TransactionPollingViewModel.kt +++ b/android/navi-payment/src/main/java/com/navi/payment/nativepayment/viewmodel/TransactionPollingViewModel.kt @@ -23,11 +23,9 @@ import com.navi.common.extensions.or import com.navi.common.model.RequestConfig import com.navi.common.network.models.GenericErrorResponse import com.navi.common.network.models.isSuccessWithData -import com.navi.common.usecase.LitmusExperimentsUseCase import com.navi.common.utils.toJsonObject import com.navi.pay.R import com.navi.pay.common.theme.color.NaviPayColor -import com.navi.pay.utils.LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION import com.navi.payment.model.common.SignalPaymentData import com.navi.payment.model.paymentmethod.Amount import com.navi.payment.nativepayment.NaviPaymentAnalyticScreenName @@ -81,7 +79,6 @@ constructor( private val paymentRepository: PaymentRepository, private val paymentDataProvider: PaymentDataProvider, private val transactionStatusUseCase: TransactionStatusUseCase, - private val litmusExperimentsUseCase: LitmusExperimentsUseCase, private val pmsSendMoneyUseCase: PmsSendMoneyUseCase, ) : NaviPaymentBaseVM(NaviPaymentAnalyticScreenName.TRANSACTION_POLLING_SCREEN.screenName) { @@ -114,10 +111,6 @@ constructor( private val _statusBarColorForLottieTransition = MutableSharedFlow() val statusBarColorForLottieTransition = _statusBarColorForLottieTransition.asSharedFlow() - private val _isChristmasCelebrationExperimentEnabled = MutableStateFlow(false) - val isChristmasCelebrationExperimentEnabled = - _isChristmasCelebrationExperimentEnabled.asStateFlow() - private val _paymentTransactionStatus = MutableStateFlow(TransactionPollingApiStateV2.Init) val paymentTransactionStatus = _paymentTransactionStatus.asStateFlow() @@ -126,19 +119,6 @@ constructor( init { if (naviUpiTransactionInfo.isNull()) pollTransactionStatus() else executeSendMoney() - setLitmusExperimentValues() - } - - private fun setLitmusExperimentValues() { - viewModelScope.safeLaunch(Dispatchers.IO) { - _isChristmasCelebrationExperimentEnabled.update { - litmusExperimentsUseCase - .execute(experimentName = LITMUS_EXPERIMENT_NAVIPAY_CHRISTMAS_CELEBRATION) - ?.variant - ?.enabled - .orFalse() - } - } } private fun executeSendMoney() {