Skip to content

Expense - In merged archived workspace, tapping add expense via report shows hmm not here page #63541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
inimaga merged 3 commits into from
Jun 11, 2025
Merged

Expense - In merged archived workspace, tapping add expense via report shows hmm not here page #63541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16905a7
update code
thelullabyy Jun 10, 2025
c476567
refactor
thelullabyy Jun 10, 2025
7336d8e
fix lint
thelullabyy Jun 10, 2025
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
3 changes: 2 additions & 1 deletion src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,8 +652,9 @@ function MoneyReportHeader({
policies,
isBetaEnabled(CONST.BETAS.RETRACT_NEWDOT),
isBetaEnabled(CONST.BETAS.NEW_DOT_SPLITS),
isChatReportArchived,
);
}, [moneyRequestReport, transactions, violations, policy, reportNameValuePairs, reportActions, policies, isBetaEnabled]);
}, [moneyRequestReport, transactions, violations, policy, reportNameValuePairs, reportActions, policies, isBetaEnabled, isChatReportArchived]);

const secondaryActionsImplementation: Record<
ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>,
Expand Down
10 changes: 7 additions & 3 deletions src/libs/ReportPreviewActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ import {
import {getSession} from './SessionUtils';
import {allHavePendingRTERViolation, isScanning, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';

function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[], isReportArchived = false) {
if (isReportArchived) {
return false;
}

const isExpense = isExpenseReport(report);
const isSubmitter = isCurrentUserSubmitter(report.reportID);
const isOpen = isOpenReport(report);
Expand Down Expand Up @@ -227,10 +231,10 @@ function getReportPreviewAction(
if (!report) {
return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
}
if (isAddExpenseAction(report, transactions ?? [])) {
if (isAddExpenseAction(report, transactions ?? [], isReportArchived)) {
return CONST.REPORT.REPORT_PREVIEW_ACTIONS.ADD_EXPENSE;
}
if (canSubmit(report, violations, policy, transactions)) {
if (canSubmit(report, violations, policy, transactions, isReportArchived)) {
return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
}
if (canApprove(report, violations, policy, transactions)) {
Expand Down
8 changes: 6 additions & 2 deletions src/libs/ReportPrimaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ type GetReportPrimaryActionParams = {
isChatReportArchived?: boolean;
};

function isAddExpenseAction(report: Report, reportTransactions: Transaction[]) {
function isAddExpenseAction(report: Report, reportTransactions: Transaction[], isChatReportArchived = false) {
if (isChatReportArchived) {
return false;
}

const isExpenseReport = isExpenseReportUtils(report);
const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
const canAddTransaction = canAddTransactionUtil(report);
Expand Down Expand Up @@ -299,7 +303,7 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf<t

const isPayActionWithAllExpensesHeld = isPrimaryPayAction(report, policy, reportNameValuePairs, isChatReportArchived) && hasOnlyHeldExpenses(report?.reportID);

if (isAddExpenseAction(report, reportTransactions)) {
if (isAddExpenseAction(report, reportTransactions, isChatReportArchived)) {
return CONST.REPORT.PRIMARY_ACTIONS.ADD_EXPENSE;
}

Expand Down
16 changes: 12 additions & 4 deletions src/libs/ReportSecondaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,15 @@ function isSplitAction(report: Report, reportTransactions: Transaction[], policy
return isSubmitter || isAdmin || isManager;
}

function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, reportNameValuePairs?: ReportNameValuePairs, reportActions?: ReportAction[]): boolean {
if (isArchivedReport(reportNameValuePairs)) {
function isSubmitAction(
report: Report,
reportTransactions: Transaction[],
policy?: Policy,
reportNameValuePairs?: ReportNameValuePairs,
reportActions?: ReportAction[],
isChatReportArchived = false,
): boolean {
if (isArchivedReport(reportNameValuePairs) || isChatReportArchived) {
return false;
}

Expand Down Expand Up @@ -502,18 +509,19 @@ function getSecondaryReportActions(
policies?: OnyxCollection<Policy>,
canUseRetractNewDot?: boolean,
canUseNewDotSplits?: boolean,
isChatReportArchived = false,
): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];

if (isPrimaryPayAction(report, policy, reportNameValuePairs) && hasOnlyHeldExpenses(report?.reportID)) {
options.push(CONST.REPORT.SECONDARY_ACTIONS.PAY);
}

if (isAddExpenseAction(report, reportTransactions, isArchivedReport(reportNameValuePairs))) {
if (isAddExpenseAction(report, reportTransactions, isChatReportArchived || isArchivedReport(reportNameValuePairs))) {
options.push(CONST.REPORT.SECONDARY_ACTIONS.ADD_EXPENSE);
}

if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs, reportActions)) {
if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs, reportActions, isChatReportArchived)) {
options.push(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT);
}

Expand Down
Loading