[Due for payment 2025-10-31] [$250] Create report button is shown in per diem expense when default workspace does not have per diem

[mitarachim]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: 9.2.32-0
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack: #71866
Email or phone of affected tester (no customers): sjidnojoidjiojdsd@gmail.com
Issue reported by: Applause Internal Team
Device used: Mac 15.5 / Chrome
App Component: Money Requests

Action Performed:

Precondition:

• Account has a default workspace which does not have per diem feature (disabled).
• Create a second workspace with per diem rates.

1. Go to staging.new.expensify.com
2. Go to the second workspace chat.
3. Create a per diem expense in workspace chat.
4. Open the expense report.
5. Click Report field
6. Click Create report.

Expected Result:

Create report button subtitle should display the correct workspace because per diem expense cannot be moved to the default workspace because it does not have per diem feature.

Actual Result:

Create report button subtitle displays the default workspace, which does not have per diem feature.
After clicking Create report button, the new report is created but the per diem expense cannot be moved to the new report (because the workspace does not have per diem feature).

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari
• MacOS: Desktop

Screenshots/Videos

Bug6976133_1760570833691.Screen_Recording_2025-10-16_at_07.21.00.mp4

View all open jobs on GitHub

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~021979252695058127218
• Upwork Job ID: 1979252695058127218
• Last Price Increase: 2025-10-17

Issue Owner

Current Issue Owner: @OfstadC

[melvin-bot]

Triggered auto assignment to @OfstadC (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[ryntgh]

Proposal

Please re-state the problem that we are trying to solve in this issue.

Create report button is shown in per diem expense when default workspace does not have per diem

What is the root cause of that problem?

usePolicyForMovingExpenses determines which workspace to use when creating a new report for expenses, but it doesn't consider whether the selected workspace actually supports per diem expenses

App/src/hooks/usePolicyForMovingExpenses.ts

Lines 33 to 45 in 0093109

	const userPolicies = Object.values(allPolicies ?? {}).filter(
	(policy) =>
	checkForUserPendingDelete(login, policy) && isPolicyMemberByRole(policy) && isPaidGroupPolicy(policy) && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
	);
	const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;
	if (activePolicy) {
	return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
	}
	if (userPolicies.length === 1) {
	return {policyForMovingExpensesID: userPolicies.at(0)?.id, policyForMovingExpenses: userPolicies.at(0), shouldSelectPolicy: false};
	}

However, it doesn't filter out policies that don't support per diem when dealing with per diem expenses

What changes do you think we should make in order to solve the problem?

Update the usePolicyForMovingExpenses hook to accept an isPerDiemRequest parameter:

function usePolicyForMovingExpenses(isPerDiemRequest?: boolean) {
    ...
    const userPolicies = Object.values(allPolicies ?? {}).filter(
        (policy) =>
            checkForUserPendingDelete(login, policy) &&
            isPolicyMemberByRole(policy) &&
            isPaidGroupPolicy(policy) &&
            policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
            (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy)),
    );
    const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;

    if (activePolicy && (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(activePolicy))) {
        return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
    }
    ...
}

App/src/hooks/usePolicyForMovingExpenses.ts

Lines 23 to 52 in 0093109

	function usePolicyForMovingExpenses() {
	const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true});
	const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
	const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {
	canBeMissing: true,
	selector: activePolicySelector,
	});
	const session = useSession();
	const login = session?.email ?? '';
	const userPolicies = Object.values(allPolicies ?? {}).filter(
	(policy) =>
	checkForUserPendingDelete(login, policy) && isPolicyMemberByRole(policy) && isPaidGroupPolicy(policy) && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
	);
	const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;
	if (activePolicy) {
	return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
	}
	if (userPolicies.length === 1) {
	return {policyForMovingExpensesID: userPolicies.at(0)?.id, policyForMovingExpenses: userPolicies.at(0), shouldSelectPolicy: false};
	}
	if (isMemberOfMoreThanOnePolicy) {
	return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: true};
	}
	return {policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined, shouldSelectPolicy: false};
	}

Then update the call site in IOURequestEditReportCommon and IOURequestStepReport to pass the per diem flag

const {policyForMovingExpenses} = usePolicyForMovingExpenses(isPerDiemRequest);

App/src/pages/iou/request/step/IOURequestEditReportCommon.tsx

Line 71 in 0093109

const {policyForMovingExpenses} = usePolicyForMovingExpenses();

const {policyForMovingExpensesID, shouldSelectPolicy} = usePolicyForMovingExpenses(isPerDiemRequest(transaction));

App/src/pages/iou/request/step/IOURequestStepReport.tsx

Line 56 in 0093109

const {policyForMovingExpensesID, shouldSelectPolicy} = usePolicyForMovingExpenses();

What alternative solutions did you explore? (Optional)

None

[dmkt9]

Proposal

Please re-state the problem that we are trying to solve in this issue.

Create report button subtitle displays the default workspace, which does not have per diem feature.
After clicking Create report button, the new report is created but the per diem expense cannot be moved to the new report (because the workspace does not have per diem feature).

What is the root cause of that problem?

1. usePolicyForMovingExpenses is used to retrieve the policyID for creating a report. However, this hook doesn’t check whether the transaction is of the per diem type, nor does it filter out invalid policies. Additionally, it defaults to returning the default policy.
   

   App/src/hooks/usePolicyForMovingExpenses.ts

   Lines 33 to 41 in e4aabe2

   	const userPolicies = Object.values(allPolicies ?? {}).filter(
   	(policy) =>
   	checkForUserPendingDelete(login, policy) && isPolicyMemberByRole(policy) && isPaidGroupPolicy(policy) && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
   	);
   	const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;
   	if (activePolicy) {
   	return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
   	}

2. isChangeWorkspaceAction is used to determine whether to display the "Change Workspace" menu item. However, this function doesn’t check whether the current report contains a per diem transaction, nor does it filter out policies that don’t have the per diem feature enabled.
   

   App/src/libs/ReportSecondaryActionUtils.ts

   Lines 444 to 458 in e4aabe2

   	function isChangeWorkspaceAction(report: Report, policies: OnyxCollection<Policy>, reportActions?: ReportAction[]): boolean {
   	// We can't move the iou report to the workspace if both users from the iou report create the expense
   	if (isIOUReportUtils(report) && doesReportContainRequestsFromMultipleUsers(report)) {
   	return false;
   	}
   	const submitterEmail = getLoginByAccountID(report?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID);
   	const availablePolicies = Object.values(policies ?? {}).filter((newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy));
   	let hasAvailablePolicies = availablePolicies.length > 1;
   	if (!hasAvailablePolicies && availablePolicies.length === 1) {
   	hasAvailablePolicies = !report.policyID || report.policyID !== availablePolicies?.at(0)?.id;
   	}
   	const reportPolicy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
   	return hasAvailablePolicies && canEditReportPolicy(report, reportPolicy) && !isExportedUtils(reportActions);
   	}

3. Similarly, on ReportChangeWorkspacePage, the policy list displays all posible policies.
   

   App/src/pages/ReportChangeWorkspacePage.tsx

   Lines 119 to 127 in e4aabe2

   	const {sections, shouldShowNoResultsFoundMessage, shouldShowSearchInput} = useWorkspaceList({
   	policies,
   	currentUserLogin: session?.email,
   	shouldShowPendingDeletePolicy: false,
   	selectedPolicyIDs: report.policyID ? [report.policyID] : undefined,
   	searchTerm: debouncedSearchTerm,
   	localeCompare,
   	additionalFilter: (newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy),
   	});

What changes do you think we should make in order to solve the problem?

We should apply policy filtering as already done when changing reports:

App/src/pages/iou/request/step/IOURequestEditReportCommon.tsx

Lines 132 to 142 in e4aabe2

	return expenseReports
	.sort((report1, report2) => sortOutstandingReportsBySelected(report1, report2, selectedReportID, localeCompare))
	.filter((report) => !debouncedSearchValue || report?.reportName?.toLowerCase().includes(debouncedSearchValue.toLowerCase()))
	.filter((report): report is NonNullable<typeof report> => report !== undefined)
	.filter((report) => {
	if (isPerDiemRequest && report?.policyID) {
	const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
	return canSubmitPerDiemExpenseFromWorkspace(policy);
	}
	return true;
	})

1. In usePolicyForMovingExpenses, we’ll introduce a new isPerDiemRequest param, which will be received from IOURequestEditReportCommon. This will allow us to filter out invalid policies.
   

   App/src/hooks/usePolicyForMovingExpenses.ts

   Lines 33 to 41 in e4aabe2

   	const userPolicies = Object.values(allPolicies ?? {}).filter(
   	(policy) =>
   	checkForUserPendingDelete(login, policy) && isPolicyMemberByRole(policy) && isPaidGroupPolicy(policy) && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
   	);
   	const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;
   	if (activePolicy) {
   	return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
   	}

const userPolicies = Object.values(allPolicies ?? {}).filter(
    (policy) =>
        checkForUserPendingDelete(login, policy) &&
        isPolicyMemberByRole(policy) &&
        isPaidGroupPolicy(policy) &&
        policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
        (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy)),
);
const isMemberOfMoreThanOnePolicy = userPolicies.length > 1;

if (activePolicy && (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(activePolicy))) {
    return {policyForMovingExpensesID: activePolicyID, policyForMovingExpenses: activePolicy, shouldSelectPolicy: false};
}

NOTE: Review all other usages of usePolicyForMovingExpenses.

2. For ReportChangeWorkspacePage, filter out policies that don’t have the per diem feature enabled if the report contains a per diem transaction.
   

   App/src/pages/ReportChangeWorkspacePage.tsx

   Lines 119 to 127 in e4aabe2

   	const {sections, shouldShowNoResultsFoundMessage, shouldShowSearchInput} = useWorkspaceList({
   	policies,
   	currentUserLogin: session?.email,
   	shouldShowPendingDeletePolicy: false,
   	selectedPolicyIDs: report.policyID ? [report.policyID] : undefined,
   	searchTerm: debouncedSearchTerm,
   	localeCompare,
   	additionalFilter: (newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy),
   	});

const {transactions: reportTransactions} = useTransactionsAndViolationsForReport(report?.reportID);
const hasPerdiemTransaction = Object.values(reportTransactions).some((transaction) => isPerDiemRequest(transaction));
const {sections, shouldShowNoResultsFoundMessage, shouldShowSearchInput} = useWorkspaceList({
    policies,
    currentUserLogin: session?.email,
    shouldShowPendingDeletePolicy: false,
    selectedPolicyIDs: report.policyID ? [report.policyID] : undefined,
    searchTerm: debouncedSearchTerm,
    localeCompare,
    additionalFilter: (newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy) && (!hasPerdiemTransaction || canSubmitPerDiemExpenseFromWorkspace(newPolicy)),
});

1. For the "Change Workspace" menu item, apply the same logic. This can be done either by filtering earlier in getSecondaryReportActions, or by adding a hasPerdiemTransaction parameter to isChangeWorkspaceAction and applying the same filtering condition there:

App/src/libs/ReportSecondaryActionUtils.ts

Line 451 in e4aabe2

const availablePolicies = Object.values(policies ?? {}).filter((newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy));

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~021979252695058127218

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @ikevin127 (External)

[ikevin127]

🎉 Thanks everyone for the proposals!

@ryntgh's proposal looks good to me. The RCA is correct and the proposed solution fixes the issue as required by the expected result.

Regarding additional mentions from proposal 2: whether we want to filter out the non-per-diem workspace option from being listed in the ReportChangeWorkspacePage, since it's not part of the scope I think it doesn't hold enough weight to warrant assignment over proposal 1 strictly based on that. I think proposal 1 author can handle that during PR phase if proven to be a requirement.

↪️ I'll defer to auto-assigned CME for final review / decision on ☝️

As for the removal of the "Change workspace" from the menu, I would advise against that as I think we should keep the option and instead hide the non-per-diem workspace option from the list if required.

🎀👀🎀 C+ reviewed

[melvin-bot]

Triggered auto assignment to @cristipaval, see https://stackoverflow.com/c/expensify/questions/7972 for more details.