Skip to content

fix: remove Move expense from the secondary action menu #63616

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
dangrous merged 2 commits into from
Jun 10, 2025
Merged

fix: remove Move expense from the secondary action menu #63616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed71a75
fix: remove Move expense from the secondary action menu
nkdengineer Jun 6, 2025
e07cf92
fix lint
nkdengineer Jun 6, 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
1 change: 0 additions & 1 deletion src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,6 @@ const CONST = {
ADD_EXPENSE: 'addExpense',
SPLIT: 'split',
REOPEN: 'reopen',
MOVE_EXPENSE: 'moveExpense',
PAY: 'pay',
},
PRIMARY_ACTIONS: {
Expand Down
29 changes: 0 additions & 29 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {ActivityIndicator, InteractionManager, View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import type {ValueOf} from 'type-fest';
import useActiveRoute from '@hooks/useActiveRoute';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
Expand Down Expand Up @@ -43,7 +42,6 @@ import {
isInvoiceReport as isInvoiceReportUtil,
isProcessingReport,
isReportOwner,
isTrackExpenseReport as isTrackExpenseReportUtil,
navigateOnDeleteExpense,
navigateToDetailsPage,
reportTransactionsSelector,
Expand Down Expand Up @@ -154,7 +152,6 @@ function MoneyReportHeader({
const {shouldUseNarrowLayout, isSmallScreenWidth, isMediumScreenWidth} = useResponsiveLayout();
const shouldDisplayNarrowVersion = shouldUseNarrowLayout || isMediumScreenWidth;
const route = useRoute();
const {getReportRHPActiveRoute} = useActiveRoute();
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`, {canBeMissing: true});
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
Expand Down Expand Up @@ -247,18 +244,6 @@ function MoneyReportHeader({
);

const isInvoiceReport = isInvoiceReportUtil(moneyRequestReport);
const isTrackExpenseReport = isTrackExpenseReportUtil(moneyRequestReport);

const iouType = useMemo(() => {
if (isTrackExpenseReport) {
return CONST.IOU.TYPE.TRACK;
}
if (isInvoiceReport) {
return CONST.IOU.TYPE.INVOICE;
}

return CONST.IOU.TYPE.SUBMIT;
}, [isTrackExpenseReport, isInvoiceReport]);

const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false);

Expand Down Expand Up @@ -800,20 +785,6 @@ function MoneyReportHeader({
Navigation.navigate(ROUTES.REPORT_WITH_ID_CHANGE_WORKSPACE.getRoute(moneyRequestReport.reportID));
},
},
[CONST.REPORT.SECONDARY_ACTIONS.MOVE_EXPENSE]: {
text: translate('iou.moveExpenses', {count: 1}),
icon: Expensicons.DocumentMerge,
value: CONST.REPORT.SECONDARY_ACTIONS.MOVE_EXPENSE,
onSelected: () => {
if (!moneyRequestReport || !transaction) {
return;
}

Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_REPORT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, moneyRequestReport.reportID, getReportRHPActiveRoute()),
);
},
},
[CONST.REPORT.SECONDARY_ACTIONS.DELETE]: {
text: translate('common.delete'),
icon: Expensicons.Trashcan,
Expand Down
19 changes: 0 additions & 19 deletions src/libs/ReportSecondaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {getIOUActionForReportID, getIOUActionForTransactionID, getOneTransaction
import {isPrimaryPayAction} from './ReportPrimaryActionUtils';
import {
canAddTransaction,
canEditFieldOfMoneyRequest,
canEditReportPolicy,
canHoldUnholdReportAction,
getTransactionDetails,
Expand Down Expand Up @@ -397,20 +396,6 @@ function isChangeWorkspaceAction(report: Report, policies: OnyxCollection<Policy
return hasAvailablePolicies && canEditReportPolicy(report, reportPolicy);
}

function isMoveTransactionAction(reportTransactions: Transaction[], reportActions?: ReportAction[]) {
const transaction = reportTransactions.at(0);

if (reportTransactions.length !== 1 || !transaction || !reportActions) {
return false;
}

const iouReportAction = getIOUActionForTransactionID(reportActions, transaction.transactionID);

const canMoveExpense = canEditFieldOfMoneyRequest(iouReportAction, CONST.EDIT_REQUEST_FIELD.REPORT);

return canMoveExpense;
}

function isDeleteAction(report: Report, reportTransactions: Transaction[], reportActions: ReportAction[], policy?: Policy): boolean {
const isExpenseReport = isExpenseReportUtils(report);
const isIOUReport = isIOUReportUtils(report);
Expand Down Expand Up @@ -562,10 +547,6 @@ function getSecondaryReportActions(
options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE);
}

if (isMoveTransactionAction(reportTransactions, reportActions)) {
options.push(CONST.REPORT.SECONDARY_ACTIONS.MOVE_EXPENSE);
}

options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);

if (isDeleteAction(report, reportTransactions, reportActions ?? [], policy)) {
Expand Down