[Held requests] Clean up the hold/unhold logic #45151
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ import useEnvironment from '@hooks/useEnvironment'; | |
| import useKeyboardShortcut from '@hooks/useKeyboardShortcut'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useNetwork from '@hooks/useNetwork'; | ||
| import usePaginatedReportActions from '@hooks/usePaginatedReportActions'; | ||
| import useResponsiveLayout from '@hooks/useResponsiveLayout'; | ||
| import useStyleUtils from '@hooks/useStyleUtils'; | ||
| import * as ReportActionsUtils from '@libs/ReportActionsUtils'; | ||
|
|
@@ -141,13 +142,64 @@ function BaseReportActionContextMenu({ | |
|
|
||
| const [download] = useOnyx(`${ONYXKEYS.COLLECTION.DOWNLOAD}${sourceID}`); | ||
|
|
||
| const childReport = ReportUtils.getReport(reportAction?.childReportID ?? '-1'); | ||
| const parentReportAction = ReportActionsUtils.getReportAction(childReport?.parentReportID ?? '', childReport?.parentReportActionID ?? ''); | ||
| const {reportActions: paginatedReportActions} = usePaginatedReportActions(childReport?.reportID ?? '-1'); | ||
|
|
||
| const transactionThreadReportID = useMemo( | ||
| () => ReportActionsUtils.getOneTransactionThreadReportID(childReport?.reportID ?? '-1', paginatedReportActions ?? [], isOffline), | ||
| [childReport?.reportID, paginatedReportActions, isOffline], | ||
| ); | ||
|
|
||
| const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`); | ||
|
|
||
| const isMoneyRequestReport = useMemo(() => ReportUtils.isMoneyRequestReport(childReport), [childReport]); | ||
| const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(childReport), [childReport]); | ||
|
|
||
| const requestParentReportAction = useMemo(() => { | ||
| if (isMoneyRequestReport || isInvoiceReport) { | ||
| if (!paginatedReportActions || !transactionThreadReport?.parentReportActionID) { | ||
| return undefined; | ||
| } | ||
| return paginatedReportActions.find((action) => action.reportActionID === transactionThreadReport.parentReportActionID); | ||
| } | ||
| return parentReportAction; | ||
| }, [parentReportAction, isMoneyRequestReport, isInvoiceReport, paginatedReportActions, transactionThreadReport?.parentReportActionID]); | ||
|
|
||
| const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction; | ||
|
|
||
| const [parentReportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${childReport?.parentReportID ?? '-1'}`); | ||
| const parentReport = ReportUtils.getReport(childReport?.parentReportID ?? '-1'); | ||
|
|
||
| const isMoneyRequest = useMemo(() => ReportUtils.isMoneyRequest(childReport), [childReport]); | ||
| const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(childReport); | ||
| const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport; | ||
| const isMoneyRequestOrReport = isMoneyRequestReport || isInvoiceReport || isSingleTransactionView; | ||
|
|
||
| const areHoldRequirementsMet = isMoneyRequestOrReport && !ReportUtils.isArchivedRoom(transactionThreadReportID ? childReport : parentReport, parentReportNameValuePairs); | ||
|
There was a problem hiding this comment. This caused an issue where the hold options are shown for invoice reports. More info here. #47570 There was a problem hiding this comment. Invoice reports were added after this change so technically it didn't cause the issue. |
||
|
|
||
| const originalReportID = useMemo(() => ReportUtils.getOriginalReportID(reportID, reportAction), [reportID, reportAction]); | ||
|
|
||
| const shouldEnableArrowNavigation = !isMini && (isVisible || shouldKeepOpen); | ||
| let filteredContextMenuActions = ContextMenuActions.filter( | ||
| (contextAction) => | ||
| !disabledActions.includes(contextAction) && | ||
| contextAction.shouldShow( | ||
| type, | ||
| reportAction, | ||
| isArchivedRoom, | ||
| betas, | ||
| anchor, | ||
| isChronosReport, | ||
| reportID, | ||
| isPinnedChat, | ||
| isUnreadChat, | ||
| !!isOffline, | ||
| isMini, | ||
| isProduction, | ||
| moneyRequestAction, | ||
| areHoldRequirementsMet, | ||
| ), | ||
| ); | ||
|
|
||
| if (isMini) { | ||
|
|
@@ -254,6 +306,7 @@ function BaseReportActionContextMenu({ | |
| interceptAnonymousUser, | ||
| openOverflowMenu, | ||
| setIsEmojiPickerActive, | ||
| moneyRequestAction, | ||
| }; | ||
|
|
||
| if ('renderContent' in contextAction) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't we have utils to get all these already?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you know of said utils then please point them out to me, but I don't think we already have one that would handle this sort of logic. This was recently written for just
ReportDetailsPagewhich unified multiple pages with hold functionalities into one component.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me see.