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

TP-69510 | Send Money Revamp Fixes (#12517)

Browse Source
This commit is contained in:
vedant aggarwal
2024-09-12 21:13:35 +05:30
committed by GitHub
parent f35bd2c802
commit b95543a45e
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/navi-pay/src/main/kotlin/com/navi/pay/management/collectrequest/ui/CollectRequestsScreen.kt
View File

@@ -67,6 +67,7 @@ fun CollectRequestsScreen(
naviPayActivity: NaviPayActivity,
navigator: DestinationsNavigator,
resultRecipient: ResultRecipient<SendMoneyScreenDestination, SendMoneyUserAction>,
resultRecipientV2: ResultRecipient<SendMoneyScreenV2Destination, SendMoneyUserAction>,
collectRequestViewModel: CollectRequestViewModel = hiltViewModel(),
naviPayAnalytics: NaviPayAnalytics.NaviPayCollectRequests =
NaviPayAnalytics.INSTANCE.NaviPayCollectRequests(),
@@ -117,7 +118,7 @@ fun CollectRequestsScreen(
var displayBlockUserMessage by remember { mutableStateOf(false) }
var blockUserMessageId by remember { mutableIntStateOf(R.string.user_blocked_successfully) }
resultRecipient.onNavResult { result ->
val handleResultRecipient = { result: NavResult<SendMoneyUserAction> ->
when (result) {
is NavResult.Canceled -> {}
is NavResult.Value -> {
@@ -144,6 +145,10 @@ fun CollectRequestsScreen(
}
}
resultRecipient.onNavResult { result -> handleResultRecipient(result) }
resultRecipientV2.onNavResult { result -> handleResultRecipient(result) }
val collectRequestState by
collectRequestViewModel.collectRequestUIState.collectAsStateWithLifecycle()
val isSnackBarVisible by collectRequestViewModel.isSnackBarVisible.collectAsStateWithLifecycle()

17
android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/viewmodel/OrderDetailsViewModel.kt
View File

@@ -593,7 +593,7 @@ constructor(
val payeeEntity =
PayeeEntity(
name = orderEntity.value.otherUserNameFormatted,
vpa = naviPayTransactionDetailsMetadata?.payeeInfo?.vpa.orEmpty(),
vpa = otherUserInfo?.vpa.orEmpty(),
phoneNumber = phoneNumber,
bankName =
transactionBankInfo.value
@@ -601,13 +601,12 @@ constructor(
?.bankEntity
?.name
.orEmpty(),
maskedAccountNumber =
naviPayTransactionDetailsMetadata?.payeeInfo?.mdAccNo,
accountType = naviPayTransactionDetailsMetadata?.payeeInfo?.bAccType
maskedAccountNumber = otherUserInfo?.mdAccNo,
accountType = otherUserInfo?.bAccType
)
val sendMoneyScreenSource =
SendMoneyScreenSource.TransactionHistoryDetail(
payerVpa = naviPayTransactionDetailsMetadata?.payerInfo?.vpa.orEmpty(),
payerVpa = otherUserInfo?.vpa.orEmpty(),
isTransactionViaUpiLite =
orderEntity.value.isSendMoneyViaUPILite.orFalse(),
phoneNumber = phoneNumber,
@@ -672,15 +671,15 @@ constructor(
val payeeEntity =
PayeeEntity(
name = orderEntity.value.otherUserNameFormatted,
vpa = naviPayTransactionDetailsMetadata?.payeeInfo?.vpa.orEmpty(),
vpa = otherUserInfo?.vpa.orEmpty(),
bankName =
transactionBankInfo.value?.otherUserBankInfo?.bankEntity?.name.orEmpty(),
maskedAccountNumber = naviPayTransactionDetailsMetadata?.payeeInfo?.mdAccNo,
accountType = naviPayTransactionDetailsMetadata?.payeeInfo?.bAccType
maskedAccountNumber = otherUserInfo?.mdAccNo,
accountType = otherUserInfo?.bAccType
)
val sendMoneyScreenSource =
SendMoneyScreenSource.TransactionHistoryDetail(
payerVpa = naviPayTransactionDetailsMetadata?.payerInfo?.vpa.orEmpty(),
payerVpa = otherUserInfo?.vpa.orEmpty(),
isTransactionViaUpiLite = orderEntity.value.isSendMoneyViaUPILite,
phoneNumber = phoneNumber,
transactionInitiationType = naviPayTransactionDetailsMetadata?.initiationMode