diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/model/view/OrderStatusOfView.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/model/view/OrderStatusOfView.kt index c6533cfbaa..0bc2a87ca8 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/model/view/OrderStatusOfView.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/model/view/OrderStatusOfView.kt @@ -39,6 +39,16 @@ enum class OrderStatusOfView(val value: String) { fun isPending(): Boolean { return this == Pending || this == RequestMoneyPending } + + fun isRequestMoneyOrCollectRequest(): Boolean { + return this == RequestMoneyExpired || + this == RequestMoneyPending || + this == RequestMoneyFailed || + this == RequestMoneyDeclined || + this == CollectRequestExpired || + this == CollectRequestDeclined || + this == CollectRequestFailed + } } fun getViewOrderStatusFromStatusAndCategoryAndOrderRequestType( diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt index 906b4af7a7..f6c8e9764b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/repository/OrderRepository.kt @@ -569,6 +569,11 @@ constructor( return null } + // Don't add collect request /request money related transactions in message db + if (orderEntity.orderStatusOfView.isRequestMoneyOrCollectRequest()) { + return null + } + // If payer or payee is NaviPay handle, then we need to have saExtCustId for conversationId // generation if (