diff --git a/src/CONST.ts b/src/CONST.ts index 58714a58c377..ae0ae7b04bde 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -1224,6 +1224,7 @@ const CONST = { }, REPORT_PREVIEW_ACTIONS: { VIEW: 'view', + ADD_EXPENSE: 'addExpense', REVIEW: 'review', SUBMIT: 'submit', APPROVE: 'approve', @@ -1235,6 +1236,10 @@ const CONST = { VIEW_DETAILS: 'viewDetails', DELETE: 'delete', }, + ADD_EXPENSE_OPTIONS: { + CREATE_NEW_EXPENSE: 'createNewExpense', + ADD_UNREPORTED_EXPENSE: 'addUnreportedExpense', + }, ACTIONS: { LIMIT: 50, // OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts diff --git a/src/ROUTES.ts b/src/ROUTES.ts index a4ac5cae8377..36a911db1608 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -606,8 +606,9 @@ const ROUTES = { }, }, MONEY_REQUEST_CREATE: { - route: ':action/:iouType/start/:transactionID/:reportID', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `${action as string}/${iouType as string}/start/${transactionID}/${reportID}` as const, + route: ':action/:iouType/start/:transactionID/:reportID/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) => + `${action as string}/${iouType as string}/start/${transactionID}/${reportID}/${backToReport ?? ''}` as const, }, MONEY_REQUEST_STEP_SEND_FROM: { route: 'create/:iouType/from/:transactionID/:reportID', @@ -619,17 +620,19 @@ const ROUTES = { getUrlWithBackToParam(`create/${iouType as string}/company-info/${transactionID}/${reportID}`, backTo), }, MONEY_REQUEST_STEP_CONFIRMATION: { - route: ':action/:iouType/confirmation/:transactionID/:reportID', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined, participantsAutoAssigned?: boolean) => - `${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}${participantsAutoAssigned ? '?participantsAutoAssigned=true' : ''}` as const, + route: ':action/:iouType/confirmation/:transactionID/:reportID/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string | undefined, backToReport?: string, participantsAutoAssigned?: boolean) => + `${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}/${backToReport ?? ''}${ + participantsAutoAssigned ? '?participantsAutoAssigned=true' : '' + }` as const, }, MONEY_REQUEST_STEP_AMOUNT: { - route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, pageIndex: string, backTo = '') => { + route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, pageIndex: string, backToReport?: string, backTo = '') => { if (!transactionID || !reportID) { Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_AMOUNT route'); } - return getUrlWithBackToParam(`${action as string}/${iouType as string}/amount/${transactionID}/${reportID}/${pageIndex}`, backTo); + return getUrlWithBackToParam(`${action as string}/${iouType as string}/amount/${transactionID}/${reportID}/${pageIndex}/${backToReport ?? ''}`, backTo); }, }, MONEY_REQUEST_STEP_TAX_RATE: { @@ -897,21 +900,24 @@ const ROUTES = { getRoute: (iouType: IOUType, iouRequestType: IOURequestType) => `start/${iouType as string}/${iouRequestType as string}` as const, }, MONEY_REQUEST_CREATE_TAB_DISTANCE: { - route: ':action/:iouType/start/:transactionID/:reportID/distance', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `create/${iouType as string}/start/${transactionID}/${reportID}/distance` as const, + route: ':action/:iouType/start/:transactionID/:reportID/distance/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) => + `create/${iouType as string}/start/${transactionID}/${reportID}/distance/${backToReport ?? ''}` as const, }, MONEY_REQUEST_CREATE_TAB_MANUAL: { - route: ':action/:iouType/start/:transactionID/:reportID/manual', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => - `${action as string}/${iouType as string}/start/${transactionID}/${reportID}/manual` as const, + route: ':action/:iouType/start/:transactionID/:reportID/manual/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) => + `${action as string}/${iouType as string}/start/${transactionID}/${reportID}/manual/${backToReport ?? ''}` as const, }, MONEY_REQUEST_CREATE_TAB_SCAN: { - route: ':action/:iouType/start/:transactionID/:reportID/scan', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `create/${iouType as string}/start/${transactionID}/${reportID}/scan` as const, + route: ':action/:iouType/start/:transactionID/:reportID/scan/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) => + `create/${iouType as string}/start/${transactionID}/${reportID}/scan/${backToReport ?? ''}` as const, }, MONEY_REQUEST_CREATE_TAB_PER_DIEM: { - route: ':action/:iouType/start/:transactionID/:reportID/per-diem', - getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) => `create/${iouType as string}/start/${transactionID}/${reportID}/per-diem` as const, + route: ':action/:iouType/start/:transactionID/:reportID/per-diem/:backToReport?', + getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) => + `create/${iouType as string}/start/${transactionID}/${reportID}/per-diem/${backToReport ?? ''}` as const, }, MONEY_REQUEST_STATE_SELECTOR: { diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts index 5ec5fdbe7866..720a599f7391 100644 --- a/src/components/ButtonWithDropdownMenu/types.ts +++ b/src/components/ButtonWithDropdownMenu/types.ts @@ -1,6 +1,7 @@ import type {RefObject} from 'react'; import type {GestureResponderEvent, StyleProp, View, ViewStyle} from 'react-native'; import type {ValueOf} from 'type-fest'; +import type {PopoverMenuItem} from '@components/PopoverMenu'; import type CONST from '@src/CONST'; import type AnchorAlignment from '@src/types/utils/AnchorAlignment'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; @@ -35,6 +36,7 @@ type DropdownOption = { shouldCloseModalOnSelect?: boolean; displayInDefaultIconColor?: boolean; shouldPreserveSelectionAfterHideModal?: boolean; + subMenuItems?: PopoverMenuItem[]; }; type ButtonWithDropdownMenuProps = { diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 06ef767b5af2..c5d14ac7d636 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -15,7 +15,7 @@ import useSelectedTransactionsActions from '@hooks/useSelectedTransactionsAction import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; -import {exportReportToCSV, exportToIntegration, markAsManuallyExported} from '@libs/actions/Report'; +import {exportReportToCSV, exportToIntegration, markAsManuallyExported, openUnreportedExpense} from '@libs/actions/Report'; import {convertToDisplayString} from '@libs/CurrencyUtils'; import {getThreadReportIDsForTransactions} from '@libs/MoneyRequestReportUtils'; import Navigation from '@libs/Navigation/Navigation'; @@ -401,6 +401,31 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea } }, [connectedIntegration, exportModalStatus, moneyRequestReport?.reportID]); + const addExpenseDropdownOptions: Array>> = useMemo( + () => [ + { + value: CONST.REPORT.ADD_EXPENSE_OPTIONS.CREATE_NEW_EXPENSE, + text: translate('iou.createNewExpense'), + icon: Expensicons.Plus, + onSelected: () => { + if (!moneyRequestReport?.reportID) { + return; + } + startMoneyRequest(CONST.IOU.TYPE.SUBMIT, moneyRequestReport?.reportID); + }, + }, + { + value: CONST.REPORT.ADD_EXPENSE_OPTIONS.ADD_UNREPORTED_EXPENSE, + text: translate('iou.addUnreportedExpense'), + icon: Expensicons.ReceiptPlus, + onSelected: () => { + openUnreportedExpense(moneyRequestReport?.reportID); + }, + }, + ], + [moneyRequestReport?.reportID, translate], + ); + const primaryActionsImplementation = { [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (