@@ -5,7 +5,7 @@ import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactio
55
66import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID' ;
77import Navigation from '@libs/Navigation/Navigation' ;
8- import { changeMoneyRequestHoldStatus , isCurrentUserSubmitter } from '@libs/ReportUtils' ;
8+ import { changeMoneyRequestHoldStatus , isCurrentUserSubmitter , isDM } from '@libs/ReportUtils' ;
99
1010import CONST from '@src/CONST' ;
1111import ONYXKEYS from '@src/ONYXKEYS' ;
@@ -40,6 +40,7 @@ function useHoldRejectActions({reportID, onHoldEducationalOpen, onRejectModalOpe
4040 const expensifyIcons = useMemoizedLazyExpensifyIcons ( [ 'Stopwatch' , 'ThumbsDown' ] as const ) ;
4141
4242 const [ moneyRequestReport ] = useOnyx ( `${ ONYXKEYS . COLLECTION . REPORT } ${ reportID } ` ) ;
43+ const [ chatReport ] = useOnyx ( `${ ONYXKEYS . COLLECTION . REPORT } ${ getNonEmptyStringOnyxID ( moneyRequestReport ?. chatReportID ) } ` ) ;
4344 const { iouTransactionID, requestParentReportAction} = useMoneyReportTransactionThread ( ) ;
4445 const { login : currentUserLogin , accountID : currentUserAccountID } = useCurrentUserPersonalDetails ( ) ;
4546
@@ -52,6 +53,7 @@ function useHoldRejectActions({reportID, onHoldEducationalOpen, onRejectModalOpe
5253 const [ dismissedHoldUseExplanation ] = useOnyx ( ONYXKEYS . NVP_DISMISSED_HOLD_USE_EXPLANATION ) ;
5354
5455 const isReportSubmitter = isCurrentUserSubmitter ( chatIOUReport ) ;
56+ const isChatReportDM = isDM ( chatReport ) ;
5557
5658 return {
5759 [ CONST . REPORT . SECONDARY_ACTIONS . HOLD ] : {
@@ -69,11 +71,12 @@ function useHoldRejectActions({reportID, onHoldEducationalOpen, onRejectModalOpe
6971 return ;
7072 }
7173
72- const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation ;
74+ const shouldShowHoldEducationalModal = isReportSubmitter || isChatReportDM ;
75+ const isDismissed = shouldShowHoldEducationalModal ? dismissedHoldUseExplanation : dismissedRejectUseExplanation ;
7376
7477 if ( isDismissed ) {
7578 changeMoneyRequestHoldStatus ( requestParentReportAction , transaction , isOffline , currentUserLogin ?? '' , currentUserAccountID , transactionViolations ) ;
76- } else if ( isReportSubmitter ) {
79+ } else if ( shouldShowHoldEducationalModal ) {
7780 onHoldEducationalOpen ( ) ;
7881 } else {
7982 onRejectModalOpen ( CONST . REPORT . TRANSACTION_SECONDARY_ACTIONS . HOLD ) ;
0 commit comments