Skip to content
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

[CP Staging] Scan - "Unhold" option appears in report details page of scanning expense #44243

Merged
merged 3 commits into from
Jun 24, 2024
Merged

[CP Staging] Scan - "Unhold" option appears in report details page of scanning expense #44243

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f41e297
correct hold action conditional to enable only after scanning
cdOut Jun 24, 2024
c5d8cbb
fix prettier
cdOut Jun 24, 2024
080b27a
refactor conditional and remove obsolete code
cdOut Jun 24, 2024
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
8 changes: 7 additions & 1 deletion src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,14 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID);
const isApproved = ReportUtils.isReportApproved(moneyRequestReport);

const shouldShowHoldAction = caseID !== CASES.MONEY_REPORT && !isSettled && !isApproved && !isDeletedParentAction && !ReportUtils.isArchivedRoom(parentReport);
const canHoldUnholdReportAction = ReportUtils.canHoldUnholdReportAction(parentReportAction);
const shouldShowHoldAction =
caseID !== CASES.MONEY_REPORT &&
(canHoldUnholdReportAction.canHoldRequest || canHoldUnholdReportAction.canUnholdRequest) &&
!isSettled &&
!isApproved &&
!isDeletedParentAction &&
Beamanator marked this conversation as resolved.
Show resolved Hide resolved
!ReportUtils.isArchivedRoom(parentReport);

const canJoin = !isExpenseReport && ReportUtils.canJoinChat(report, parentReportAction, policy);

Expand Down
Loading