diff --git a/src/components/KYCWall/BaseKYCWall.tsx b/src/components/KYCWall/BaseKYCWall.tsx index be3641aa3508..fdb139f30b43 100644 --- a/src/components/KYCWall/BaseKYCWall.tsx +++ b/src/components/KYCWall/BaseKYCWall.tsx @@ -7,6 +7,8 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails' import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useParentReportAction from '@hooks/useParentReportAction'; +import usePermissions from '@hooks/usePermissions'; +import useReportTransactions from '@hooks/useReportTransactions'; import {openPersonalBankAccountSetupView} from '@libs/actions/BankAccounts'; import {completePaymentOnboarding, savePreferredPaymentMethod} from '@libs/actions/IOU'; import {navigateToBankAccountRoute} from '@libs/actions/ReimbursementAccount'; @@ -70,6 +72,9 @@ function KYCWall({ const reportPreviewAction = useParentReportAction(iouReport); const personalDetails = usePersonalDetails(); const employeeEmail = personalDetails?.[iouReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]?.login ?? ''; + const reportTransactions = useReportTransactions(iouReport?.reportID); + const {isBetaEnabled} = usePermissions(); + const isCustomReportNamesBetaEnabled = isBetaEnabled(CONST.BETAS.CUSTOM_REPORT_NAMES); const anchorRef = useRef(null); const transferBalanceButtonRef = useRef(null); @@ -135,7 +140,7 @@ function KYCWall({ if (iouReport && isIOUReport(iouReport)) { const adminPolicy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policy?.id}`]; if (adminPolicy) { - const inviteResult = moveIOUReportToPolicyAndInviteSubmitter(iouReport?.reportID, adminPolicy, formatPhoneNumber); + const inviteResult = moveIOUReportToPolicyAndInviteSubmitter(iouReport?.reportID, adminPolicy, formatPhoneNumber, reportTransactions, isCustomReportNamesBetaEnabled); if (inviteResult?.policyExpenseChatReportID) { setNavigationActionToMicrotaskQueue(() => { Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(inviteResult.policyExpenseChatReportID)); @@ -145,7 +150,7 @@ function KYCWall({ Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(adminPolicy.id)); }); } else { - const moveResult = moveIOUReportToPolicy(iouReport?.reportID, adminPolicy, true); + const moveResult = moveIOUReportToPolicy(iouReport?.reportID, adminPolicy, true, reportTransactions, isCustomReportNamesBetaEnabled); savePreferredPaymentMethod(iouReport.policyID, adminPolicy.id, CONST.LAST_PAYMENT_METHOD.IOU, lastPaymentMethod?.[adminPolicy.id]); if (moveResult?.policyExpenseChatReportID && !moveResult.useTemporaryOptimisticExpenseChatReportID) { @@ -210,6 +215,8 @@ function KYCWall({ reportPreviewAction, currentUserEmail, employeeEmail, + reportTransactions, + isCustomReportNamesBetaEnabled, ], ); diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 4191a94b26fa..aa380cd34183 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -168,7 +168,6 @@ import { isSelfDM, isUnread, isValidReportIDFromPath, - populateOptimisticReportFormula, prepareOnboardingOnyxData, } from '@libs/ReportUtils'; import {getCurrentSearchQueryJSON} from '@libs/SearchQueryUtils'; @@ -5345,14 +5344,13 @@ function deleteAppReport( /** * Moves an IOU report to a policy by converting it to an expense report - * @param reportID - The ID of the IOU report to move - * @param policy - The policy to move the report to - * @param isFromSettlementButton - Whether the action is from report preview */ function moveIOUReportToPolicy( reportID: string, policy: Policy, isFromSettlementButton?: boolean, + reportTransactions: Transaction[] = [], + isCustomReportNamesBetaEnabled?: boolean, ): {policyExpenseChatReportID?: string; useTemporaryOptimisticExpenseChatReportID: boolean} | undefined { const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; @@ -5379,6 +5377,8 @@ function moveIOUReportToPolicy( policy, policyID, optimisticExpenseChatReportID, + reportTransactions, + isCustomReportNamesBetaEnabled, ); const parameters: MoveIOUReportToExistingPolicyParams = { @@ -5394,13 +5394,14 @@ function moveIOUReportToPolicy( } /** - * Moves an IOU report to a policy by converting it to an expense report - * @param reportID - The ID of the IOU report to move + * Moves an IOU report to a policy by converting it to an expense report and invites the submitter */ function moveIOUReportToPolicyAndInviteSubmitter( reportID: string, policy: Policy, formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], + reportTransactions: Transaction[] = [], + isCustomReportNamesBetaEnabled?: boolean, ): {policyExpenseChatReportID?: string} | undefined { const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; @@ -5532,7 +5533,7 @@ function moveIOUReportToPolicyAndInviteSubmitter( failureData: convertedFailureData, movedExpenseReportAction, movedReportAction, - } = convertIOUReportToExpenseReport(iouReport, policy, policyID, optimisticPolicyExpenseChatReportID); + } = convertIOUReportToExpenseReport(iouReport, policy, policyID, optimisticPolicyExpenseChatReportID, reportTransactions, isCustomReportNamesBetaEnabled); optimisticData.push(...convertedOptimisticData); successData.push(...convertedSuccessData); @@ -5551,7 +5552,14 @@ function moveIOUReportToPolicyAndInviteSubmitter( return {policyExpenseChatReportID: optimisticPolicyExpenseChatReportID}; } -function convertIOUReportToExpenseReport(iouReport: Report, policy: Policy, policyID: string, optimisticPolicyExpenseChatReportID: string) { +function convertIOUReportToExpenseReport( + iouReport: Report, + policy: Policy, + policyID: string, + optimisticPolicyExpenseChatReportID: string, + reportTransactions: Transaction[] = [], + isCustomReportNamesBetaEnabled?: boolean, +) { const optimisticData: Array> = []; const successData: Array> = []; const failureData: Array> = []; @@ -5573,9 +5581,27 @@ function convertIOUReportToExpenseReport(iouReport: Report, policy: Policy, poli expenseReport.managerID = nextApproverAccountID; } - const titleReportField = getTitleReportField(getReportFieldsByPolicyID(policyID) ?? {}); - if (!!titleReportField && isPaidGroupPolicy(policy)) { - expenseReport.reportName = populateOptimisticReportFormula(titleReportField.defaultValue, expenseReport, policy); + // Only compute optimistic report name if the user is on the CUSTOM_REPORT_NAMES beta + if (isCustomReportNamesBetaEnabled) { + const titleReportField = getTitleReportField(getReportFieldsByPolicyID(policyID) ?? {}); + if (!!titleReportField && isPaidGroupPolicy(policy)) { + // Convert transactions array to Record for FormulaContext + const transactionsRecord: Record = {}; + for (const transaction of reportTransactions) { + if (transaction?.transactionID) { + transactionsRecord[transaction.transactionID] = transaction; + } + } + + // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires + const Formula = require('@libs/Formula') as {compute: (formula?: string, context?: {report: Report; policy: Policy; allTransactions?: Record}) => string}; + const computedName = Formula.compute(titleReportField.defaultValue, { + report: expenseReport, + policy, + allTransactions: transactionsRecord, + }); + expenseReport.reportName = computedName ?? expenseReport.reportName; + } } const reportID = iouReport.reportID; @@ -5591,9 +5617,6 @@ function convertIOUReportToExpenseReport(iouReport: Report, policy: Policy, poli value: iouReport, }); - // The expense report transactions need to have the amount reversed to negative values - const reportTransactions = getReportTransactions(reportID); - // For performance reasons, we are going to compose a merge collection data for transactions const transactionsOptimisticData: Record = {}; const transactionFailureData: Record = {}; diff --git a/src/pages/ReportChangeWorkspacePage.tsx b/src/pages/ReportChangeWorkspacePage.tsx index b3abdd9e28dc..3e2c148f568c 100644 --- a/src/pages/ReportChangeWorkspacePage.tsx +++ b/src/pages/ReportChangeWorkspacePage.tsx @@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; import useReportIsArchived from '@hooks/useReportIsArchived'; +import useReportTransactions from '@hooks/useReportTransactions'; import useThemeStyles from '@hooks/useThemeStyles'; import useWorkspaceList from '@hooks/useWorkspaceList'; import {changeReportPolicy, changeReportPolicyAndInviteSubmitter, moveIOUReportToPolicy, moveIOUReportToPolicyAndInviteSubmitter} from '@libs/actions/Report'; @@ -51,6 +52,7 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro const styles = useThemeStyles(); const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(''); const {translate, formatPhoneNumber, localeCompare} = useLocalize(); + const reportTransactions = useReportTransactions(reportID); const [policies, fetchStatus] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); const [reportNextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${reportID}`, {canBeMissing: true}); @@ -58,14 +60,16 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: false}); const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true}); const isReportLastVisibleArchived = useReportIsArchived(report?.parentReportID); + const reportOwnerAccountID = report?.ownerAccountID; const submitterEmailSelector = useCallback( - (personalDetailsList: OnyxEntry) => personalDetailsList?.[report?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID]?.login, - [report?.ownerAccountID], + (personalDetailsList: OnyxEntry) => personalDetailsList?.[reportOwnerAccountID ?? CONST.DEFAULT_NUMBER_ID]?.login, + [reportOwnerAccountID], ); const [submitterEmail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false, selector: submitterEmailSelector}, [submitterEmailSelector]); const shouldShowLoadingIndicator = isLoadingApp && !isOffline; const {isBetaEnabled} = usePermissions(); const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); + const isCustomReportNamesBetaEnabled = isBetaEnabled(CONST.BETAS.CUSTOM_REPORT_NAMES); const session = useSession(); const hasViolations = hasViolationsReportUtils(report?.reportID, transactionViolations, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email ?? ''); @@ -82,9 +86,9 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro const {backTo} = route.params; Navigation.goBack(backTo); if (isIOUReport(reportID)) { - const invite = moveIOUReportToPolicyAndInviteSubmitter(reportID, policy, formatPhoneNumber); + const invite = moveIOUReportToPolicyAndInviteSubmitter(reportID, policy, formatPhoneNumber, reportTransactions, isCustomReportNamesBetaEnabled); if (!invite?.policyExpenseChatReportID) { - moveIOUReportToPolicy(reportID, policy); + moveIOUReportToPolicy(reportID, policy, false, reportTransactions, isCustomReportNamesBetaEnabled); } // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 // eslint-disable-next-line @typescript-eslint/no-deprecated @@ -122,11 +126,13 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro reportID, report, formatPhoneNumber, + reportTransactions, isReportLastVisibleArchived, session?.accountID, session?.email, hasViolations, isASAPSubmitBetaEnabled, + isCustomReportNamesBetaEnabled, reportNextStep, isChangePolicyTrainingModalDismissed, ], diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx index 02c2a31e3705..61df2302045e 100644 --- a/src/pages/Search/SearchPage.tsx +++ b/src/pages/Search/SearchPage.tsx @@ -135,6 +135,7 @@ function SearchPage({route}: SearchPageProps) { const {showConfirmModal} = useConfirmModal(); const {isBetaEnabled} = usePermissions(); const isDEWBetaEnabled = isBetaEnabled(CONST.BETAS.NEW_DOT_DEW); + const isCustomReportNamesBetaEnabled = isBetaEnabled(CONST.BETAS.CUSTOM_REPORT_NAMES); const [isHoldEducationalModalVisible, setIsHoldEducationalModalVisible] = useState(false); const [rejectModalAction, setRejectModalAction] = useState => !!transaction && transaction.reportID === itemReportID, + ); + const invite = moveIOUReportToPolicyAndInviteSubmitter(itemReportID, adminPolicy, formatPhoneNumber, reportTransactions, isCustomReportNamesBetaEnabled); if (!invite?.policyExpenseChatReportID) { - moveIOUReportToPolicy(itemReportID, adminPolicy); + moveIOUReportToPolicy(itemReportID, adminPolicy, false, reportTransactions, isCustomReportNamesBetaEnabled); } } } @@ -583,6 +588,8 @@ function SearchPage({route}: SearchPageProps) { isDelegateAccessRestricted, showDelegateNoAccessModal, personalPolicyID, + allTransactions, + isCustomReportNamesBetaEnabled, ], );