Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/libs/ReportSecondaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ function isChangeWorkspaceAction(report: Report, policies: OnyxCollection<Policy
}

const submitterEmail = getLoginByAccountID(report?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID);
const availablePolicies = Object.values(policies ?? {}).filter((newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy));
const availablePolicies = Object.values(policies ?? {}).filter((newPolicy) => isWorkspaceEligibleForReportChange(submitterEmail, newPolicy, report));
let hasAvailablePolicies = availablePolicies.length > 1;
if (!hasAvailablePolicies && availablePolicies.length === 1) {
hasAvailablePolicies = !report.policyID || report.policyID !== availablePolicies?.at(0)?.id;
Expand Down
6 changes: 4 additions & 2 deletions src/libs/ReportUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import type {MoneyRequestAmountInputProps} from '@components/MoneyRequestAmountInput';
import type {TransactionWithOptionalSearchFields} from '@components/TransactionItemRow';
import type PolicyData from '@hooks/usePolicyData/types';
import {computeReportName} from '@libs/ReportNameUtils';

Check warning on line 26 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Unexpected subpath import via alias '@libs/ReportNameUtils'. Use './ReportNameUtils' instead
import type {PolicyTagList} from '@pages/workspace/tags/types';
import type {ThemeColors} from '@styles/theme/types';
import type {IOUAction, IOUType, OnboardingAccounting} from '@src/CONST';
Expand Down Expand Up @@ -12248,11 +12248,13 @@
/**
* Determines whether the report can be moved to the workspace.
*/
function isWorkspaceEligibleForReportChange(submitterEmail: string | undefined, newPolicy: OnyxEntry<Policy>): boolean {
function isWorkspaceEligibleForReportChange(submitterEmail: string | undefined, newPolicy: OnyxEntry<Policy>, report?: Report): boolean {
if (!submitterEmail || !newPolicy?.isPolicyExpenseChatEnabled) {
return false;
}

if (report && report.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED && !isPolicyAdminPolicyUtils(newPolicy)) {
return false;
}
return isPaidGroupPolicyPolicyUtils(newPolicy) && !!newPolicy.role;
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReportChangeWorkspacePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro
localeCompare,
additionalFilter: (newPolicy) => {
const isReportSettled = isSettled(report);
const isEligible = isWorkspaceEligibleForReportChange(submitterEmail, newPolicy);
const isEligible = isWorkspaceEligibleForReportChange(submitterEmail, newPolicy, report);
if (isReportSettled) {
return isEligible && isPolicyAdmin(newPolicy, session?.email);
}
Expand Down
Loading