Skip to content

Commit d99543a

Browse files
committed
pass isReportArchived to temporary_getMoneyRequestOptions
1 parent e9bad07 commit d99543a

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/components/ReportWelcomeText.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
5757
const participantAccountIDs = getParticipantsAccountIDsForDisplay(report, undefined, true, true, reportMetadata);
5858
const isMultipleParticipant = participantAccountIDs.length > 1;
5959
const displayNamesWithTooltips = getDisplayNamesWithTooltips(getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant);
60-
const moneyRequestOptions = temporary_getMoneyRequestOptions(report, policy, participantAccountIDs);
60+
const moneyRequestOptions = temporary_getMoneyRequestOptions(report, policy, participantAccountIDs, isReportArchived);
6161
const policyName = getPolicyName({report});
6262

6363
const filteredOptions = moneyRequestOptions.filter(

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import useLocalize from '@hooks/useLocalize';
1616
import useOnyx from '@hooks/useOnyx';
1717
import usePermissions from '@hooks/usePermissions';
1818
import usePrevious from '@hooks/usePrevious';
19+
import useReportIsArchived from '@hooks/useReportIsArchived';
1920
import useResponsiveLayout from '@hooks/useResponsiveLayout';
2021
import useTheme from '@hooks/useTheme';
2122
import useThemeStyles from '@hooks/useThemeStyles';
@@ -135,6 +136,7 @@ function AttachmentPickerWithMenuItems({
135136
const {isProduction} = useEnvironment();
136137
const {isBetaEnabled} = usePermissions();
137138
const {setIsLoaderVisible} = useFullScreenLoader();
139+
const isReportArchived = useReportIsArchived(report?.reportID);
138140

139141
const isManualDistanceTrackingEnabled = isBetaEnabled(CONST.BETAS.MANUAL_DISTANCE);
140142

@@ -228,7 +230,7 @@ function AttachmentPickerWithMenuItems({
228230
],
229231
};
230232

231-
const moneyRequestOptionsList = temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => options[option]);
233+
const moneyRequestOptionsList = temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => options[option], isReportArchived);
232234

233235
return moneyRequestOptionsList.flat().filter((item, index, self) => index === self.findIndex((t) => t.text === item.text));
234236
}, [translate, shouldUseNarrowLayout, report, policy, reportParticipantIDs, selectOption, isDelegateAccessRestricted, showDelegateNoAccessModal, isManualDistanceTrackingEnabled]);

src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import useHandleExceedMaxTaskTitleLength from '@hooks/useHandleExceedMaxTaskTitl
2727
import useLocalize from '@hooks/useLocalize';
2828
import useNetwork from '@hooks/useNetwork';
2929
import useOnyx from '@hooks/useOnyx';
30+
import useReportIsArchived from '@hooks/useReportIsArchived';
3031
import useResponsiveLayout from '@hooks/useResponsiveLayout';
3132
import useTheme from '@hooks/useTheme';
3233
import useThemeStyles from '@hooks/useThemeStyles';
@@ -217,6 +218,7 @@ function ReportActionCompose({
217218
const includesConcierge = useMemo(() => chatIncludesConcierge({participants: report?.participants}), [report?.participants]);
218219
const userBlockedFromConcierge = useMemo(() => isBlockedFromConciergeUserAction(blockedFromConcierge), [blockedFromConcierge]);
219220
const isBlockedFromConcierge = useMemo(() => includesConcierge && userBlockedFromConcierge, [includesConcierge, userBlockedFromConcierge]);
221+
const isReportArchived = useReportIsArchived(report?.reportID);
220222

221223
const isTransactionThreadView = useMemo(() => isReportTransactionThread(report), [report]);
222224
const isExpensesReport = useMemo(() => reportTransactions && reportTransactions.length > 1, [reportTransactions]);
@@ -241,7 +243,7 @@ function ReportActionCompose({
241243
const shouldDisplayDualDropZone = useMemo(() => {
242244
const parentReport = getParentReport(report);
243245
const isSettledOrApproved = isSettled(report) || isSettled(parentReport) || isReportApproved({report}) || isReportApproved({report: parentReport});
244-
return (shouldAddOrReplaceReceipt && !isSettledOrApproved) || !!temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs).length;
246+
return (shouldAddOrReplaceReceipt && !isSettledOrApproved) || !!temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived).length;
245247
}, [shouldAddOrReplaceReceipt, report, policy, reportParticipantIDs]);
246248

247249
// Placeholder to display in the chat input.

0 commit comments

Comments
 (0)