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 8487ac3f6f..eda1821bb6 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 @@ -4880,9 +4880,7 @@ constructor( updateTriggerDismissBottomSheet() notifyError(errorConfig = getBlockedUpiIdErrorConfig()) } - else -> { - notifyError() - } + else -> Unit } }, ) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/transaction/util/OrderEntityMapperUtil.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/transaction/util/OrderEntityMapperUtil.kt index a61eba480c..c8e4a1eec3 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/transaction/util/OrderEntityMapperUtil.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/transaction/util/OrderEntityMapperUtil.kt @@ -9,6 +9,7 @@ package com.navi.pay.management.common.transaction.util import com.navi.base.utils.EMPTY import com.navi.pay.common.utils.NaviPayCommonUtils.getTagStringWithSeparator +import com.navi.pay.management.common.sendmoney.model.network.getTransactionInitiationType import com.navi.pay.management.common.transaction.model.network.TransactionInstrumentType import com.navi.pay.management.common.transaction.model.network.TransactionStatus import com.navi.pay.management.common.transaction.model.view.TransactionStatusOfView @@ -115,7 +116,9 @@ private fun TransactionEntity.getNaviPayTransactionDetailsMetadata(): npTxnId = transactionDetailEntity.metaData.npTxnId, payeeInfo = transactionDetailEntity.payeeInfo.toUserTxnInfo(), payerInfo = transactionDetailEntity.payerInfo.toUserTxnInfo(), - paymentMode = OrderPaymentMode.UPI.name, + paymentMode = + getTransactionInitiationType(transactionDetailEntity.metaData.transactionInitiationMode) + .name, purposeCode = transactionDetailEntity.metaData.purposeCode, remarks = transactionDetailEntity.metaData.remarks, txnStatus = transactionDetailEntity.metaData.txnStatus, diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/paytocontacts/viewmodel/PayToContactsViewModelV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/paytocontacts/viewmodel/PayToContactsViewModelV2.kt index 9cdb5e2539..5e390215e8 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/paytocontacts/viewmodel/PayToContactsViewModelV2.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/paytocontacts/viewmodel/PayToContactsViewModelV2.kt @@ -85,7 +85,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import timber.log.Timber @HiltViewModel class PayToContactsViewModelV2 @@ -298,7 +297,6 @@ constructor( init { viewModelScope.launch(context = Dispatchers.IO) { - Timber.tag("test").d("init viewModel") initializeSynchronously() initializeAsynchronously() } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/util/UpiNumbersHelper.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/util/UpiNumbersHelper.kt index 10d8cfa1ff..46e7d32134 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/util/UpiNumbersHelper.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/upinumber/list/util/UpiNumbersHelper.kt @@ -18,15 +18,11 @@ import kotlinx.coroutines.flow.map class UpiNumbersHelper @Inject constructor(private val upiNumberRepository: UpiNumberRepository) { - fun isPhoneNumberLinkedToNavi(): Flow { + fun isPhoneNumberLinkedToNavi(): Flow { return upiNumberRepository.getUpiNumbersGroupedByVpa().map { upiNumbersGroupedByVpa -> - upiNumbersGroupedByVpa - .takeIf { it.isNotEmpty() } // return null if data is not present in DB - ?.values - ?.flatten() - ?.any { - it.upiNumber == fetchUserPhoneNumber() && it.status == UpiNumberStatus.ACTIVE - } + upiNumbersGroupedByVpa.values.flatten().any { + it.upiNumber == fetchUserPhoneNumber() && it.status == UpiNumberStatus.ACTIVE + } } } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/ui/LinkedAccountDetailScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/ui/LinkedAccountDetailScreen.kt index 0b13d2c5cb..e91ee3797b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/ui/LinkedAccountDetailScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/ui/LinkedAccountDetailScreen.kt @@ -57,7 +57,6 @@ import androidx.compose.ui.draw.shadow import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.ColorFilter -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextDecoration @@ -69,8 +68,6 @@ import androidx.compose.ui.window.DialogProperties import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import coil3.compose.AsyncImage -import coil3.request.ImageRequest -import coil3.request.allowHardware import com.navi.base.utils.orFalse import com.navi.common.R as CommonR import com.navi.common.extensions.conditional @@ -775,10 +772,7 @@ fun RCCDetailHeaderUI( .padding(horizontal = 16.dp, vertical = 26.dp), ) { AsyncImage( - model = - ImageRequest.Builder(LocalContext.current) - .data(data = linkedAccountEntity.bankIconImageUrl) - .allowHardware(true), + model = linkedAccountEntity.bankIconImageUrl, contentDescription = "", modifier = Modifier.size(26.dp), fallback = painterResource(id = CommonR.drawable.ic_upi_bbps_default_bank_logo), diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/viewmodel/LinkedAccountDetailViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/viewmodel/LinkedAccountDetailViewModel.kt index 5d5c65c540..44bdcf3072 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/viewmodel/LinkedAccountDetailViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/detail/viewmodel/LinkedAccountDetailViewModel.kt @@ -1664,11 +1664,6 @@ constructor( viewModelScope.launch(Dispatchers.IO) { val linkedAccountEntity = linkedAccountEntity.value ?: return@launch - val upiNumberPspType = upiNumbersHelper.getUpiNumbersPspOrNull() ?: return@launch - - if (!naviPayCustomerStatusHandler.isUserOnboarded(pspType = upiNumberPspType)) - return@launch - checkUpiNumberAvailabilityUseCase.checkStatus( upiNumber = phoneNumber, vpaEntityList = linkedAccountEntity.vpaEntityList, diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linkupinumber/ui/LinkUpiNumberNudgeScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linkupinumber/ui/LinkUpiNumberNudgeScreen.kt index 2df8d034a1..7fdcb2ca9a 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linkupinumber/ui/LinkUpiNumberNudgeScreen.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linkupinumber/ui/LinkUpiNumberNudgeScreen.kt @@ -64,6 +64,7 @@ import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.bottomsheet.spec.DestinationStyleBottomSheet import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.result.ResultBackNavigator +import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @@ -88,6 +89,16 @@ fun LinkUpiNumberNudgeScreen( val state by linkUpiNumberNudgeViewModel.state.collectAsStateWithLifecycle() + LaunchedEffect(Unit) { + linkUpiNumberNudgeViewModel.effect.collectLatest { + when (it) { + is LinkUpiNumberNudgeScreenContract.Effect.OnLinkUpiNumberError -> { + resultBackNavigator.navigateBack(LinkUpiNumberResult(it.errors)) + } + } + } + } + val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true, confirmValueChange = { true }) diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/viewmodel/OrderDetailsViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/viewmodel/OrderDetailsViewModel.kt index da27191f49..fe27df0f4d 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/viewmodel/OrderDetailsViewModel.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/viewmodel/OrderDetailsViewModel.kt @@ -2406,9 +2406,7 @@ constructor( updateBottomSheetUiState(showBottomSheet = false) notifyError(errorConfig = getBlockedUpiIdErrorConfig()) } - else -> { - notifyError(getGenericErrorConfig()) - } + else -> Unit } }, )