diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt index 0c536a287f..462ec0dde0 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/mandate/viewmodel/MandateDetailOfPendingCategoryViewModel.kt @@ -1059,7 +1059,9 @@ constructor( payeeVpa = mandateEntity?.payeeVpa.orEmpty(), shouldBlock = true, shouldSpam = shouldSpam, - upiRequestId = mandateEntity?.upiRequestId ?: "", + upiRequestId = + payeeEntity?.transactionId + ?: upiRequestIdUseCase.execute(pspType = selectedPsp), pspType = selectedPsp, ) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/common/ui/LinkedAccountBalanceScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/common/ui/LinkedAccountBalanceScreen.kt index cf0207282c..2e45eefdae 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/common/ui/LinkedAccountBalanceScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/common/ui/LinkedAccountBalanceScreen.kt @@ -205,6 +205,10 @@ fun LinkedAccountBalanceScreen( } } + LaunchedEffect(Unit) { + naviPayActivity.naviPayActivityDataProvider.deleteIntentData(key = PAYER_BANK_ACCOUNT_ID) + } + LaunchedEffect(Unit) { linkedAccountBalanceViewModel.navigateToRoute.collect { navigator.navigate(it)