diff --git a/src/components/PromotedActionsBar.tsx b/src/components/PromotedActionsBar.tsx index 35183c473c33f..f76a17201a49d 100644 --- a/src/components/PromotedActionsBar.tsx +++ b/src/components/PromotedActionsBar.tsx @@ -11,7 +11,6 @@ import {changeMoneyRequestHoldStatus} from '@libs/ReportUtils'; import {joinRoom, navigateToAndOpenReport, navigateToAndOpenReportWithAccountIDs} from '@userActions/Report'; import {callFunctionIfActionIsAllowed} from '@userActions/Session'; import CONST from '@src/CONST'; -import ROUTES from '@src/ROUTES'; import type {ReportAction} from '@src/types/onyx'; import type OnyxReport from '@src/types/onyx/Report'; import Button from './Button'; @@ -77,7 +76,7 @@ const PromotedActions = { } }, }), - hold: ({isTextHold, reportAction, reportID, isDelegateAccessRestricted, setIsNoDelegateAccessMenuVisible, currentSearchHash}) => ({ + hold: ({isTextHold, reportAction, isDelegateAccessRestricted, setIsNoDelegateAccessMenuVisible, currentSearchHash}) => ({ key: CONST.PROMOTED_ACTIONS.HOLD, icon: Expensicons.Stopwatch, text: translateLocal(`iou.${isTextHold ? 'hold' : 'unhold'}`), @@ -90,14 +89,13 @@ const PromotedActions = { if (!isTextHold) { Navigation.goBack(); } - const targetedReportID = reportID ?? reportAction?.childReportID ?? ''; if (!isSearchTopmostFullScreenRoute() && isTextHold) { - changeMoneyRequestHoldStatus(reportAction, ROUTES.REPORT_WITH_ID.getRoute(targetedReportID)); + changeMoneyRequestHoldStatus(reportAction); return; } - changeMoneyRequestHoldStatus(reportAction, ROUTES.SEARCH_REPORT.getRoute({reportID: targetedReportID}), currentSearchHash); + changeMoneyRequestHoldStatus(reportAction, currentSearchHash); }, }), } satisfies PromotedActionsType; diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 8a7600e03935d..27dfac39a9c93 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -3722,7 +3722,7 @@ function canHoldUnholdReportAction(reportAction: OnyxInputOrEntry) return {canHoldRequest, canUnholdRequest}; } -const changeMoneyRequestHoldStatus = (reportAction: OnyxEntry, backTo?: string, searchHash?: number): void => { +const changeMoneyRequestHoldStatus = (reportAction: OnyxEntry, searchHash?: number): void => { if (!isMoneyRequestAction(reportAction)) { return; } @@ -3747,11 +3747,8 @@ const changeMoneyRequestHoldStatus = (reportAction: OnyxEntry, bac if (isOnHold) { unholdRequest(transactionID, reportAction.childReportID, searchHash); } else { - const activeRoute = encodeURIComponent(Navigation.getActiveRouteWithoutParams()); - Navigation.navigate( - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy?.type ?? CONST.POLICY.TYPE.PERSONAL, transactionID, reportAction.childReportID, backTo || activeRoute, searchHash), - ); + const activeRoute = encodeURIComponent(Navigation.getActiveRoute()); + Navigation.navigate(ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy?.type ?? CONST.POLICY.TYPE.PERSONAL, transactionID, reportAction.childReportID, activeRoute, searchHash)); } };