Skip to content

fix:75520 get correct value for isDM in MoneyRequestHeader #77047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iwiznia merged 2 commits into from
Dec 18, 2025
Merged

fix:75520 get correct value for isDM in MoneyRequestHeader #77047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3f6eb3
fix:75520 get correct value for isDM in MoneyRequestHeader
Eskalifer1 Dec 8, 2025
65c2fb3
Merge remote-tracking branch 'origin' into fix/75520
Eskalifer1 Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/MoneyRequestHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import HoldOrRejectEducationalModal from './HoldOrRejectEducationalModal';
import HoldSubmitterEducationalModal from './HoldSubmitterEducationalModal';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';

Check warning on line 62 in src/components/MoneyRequestHeader.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

'./Icon/Expensicons' import is restricted from being used by a pattern. Direct imports from Icon/Expensicons are deprecated. Please use lazy loading hooks instead. Use `useMemoizedLazyExpensifyIcons` from @hooks/useLazyAsset. See docs/LAZY_ICONS_AND_ILLUSTRATIONS.md for details
import LoadingBar from './LoadingBar';
import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
Expand Down Expand Up @@ -133,7 +133,7 @@

const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations);
const isReportSubmitter = isCurrentUserSubmitter(chatIOUReport);
const isParentReportDM = isDM(parentReport);
const isParentChatReportDM = isDM(chatIOUReport);

// If the parent report is a selfDM, it should always be opened in the Inbox tab
const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport);
Expand Down Expand Up @@ -308,8 +308,7 @@
}

const isDismissed = isReportSubmitter ? dismissedHoldUseExplanation : dismissedRejectUseExplanation;

if (isDismissed || isParentReportDM) {
if (isDismissed || isParentChatReportDM) {
changeMoneyRequestHoldStatus(parentReportAction);
} else if (isReportSubmitter) {
setIsHoldEducationalModalVisible(true);
Expand Down
Loading