Skip to content

Commit e2b06df

Browse files
fix: chat report fix
Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 4a06624 commit e2b06df

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/components/MoneyRequestHeaderSecondaryActions.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,11 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
332332
return;
333333
}
334334

335-
const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation;
335+
const shouldShowHoldEducationalModal = isReportSubmitter || isParentChatReportDM;
336+
const isDismissed = shouldShowHoldEducationalModal ? dismissedHoldUseExplanation : dismissedRejectUseExplanation;
336337
if (isDismissed) {
337338
changeMoneyRequestHoldStatus(parentReportAction, transaction, isOffline, currentUserLogin ?? '', accountID, rawTransactionViolations);
338-
} else if (isReportSubmitter) {
339+
} else if (shouldShowHoldEducationalModal) {
339340
setIsHoldEducationalModalVisible(true);
340341
} else {
341342
setRejectModalAction(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD);

src/hooks/useHoldRejectActions.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {useMoneyReportTransactionThread} from '@components/MoneyReportTransactio
55

66
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
77
import Navigation from '@libs/Navigation/Navigation';
8-
import {changeMoneyRequestHoldStatus, isCurrentUserSubmitter} from '@libs/ReportUtils';
8+
import {changeMoneyRequestHoldStatus, isCurrentUserSubmitter, isDM} from '@libs/ReportUtils';
99

1010
import CONST from '@src/CONST';
1111
import 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

Comments
 (0)