From 980248746b0babba61e298f4a883402cf2e250af Mon Sep 17 00:00:00 2001 From: GandalfGwaihir Date: Sat, 20 Apr 2024 02:34:07 +0530 Subject: [PATCH] fix merge conflict --- src/components/MoneyRequestHeader.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 8b88509fc5f0..b8f2c7cd1dbd 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -96,16 +96,8 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction, if (isOnHold) { IOU.unholdRequest(iouTransactionID, report?.reportID); } else { - if (!policy?.type) { - return; - } - const activeRoute = encodeURIComponent(Navigation.getActiveRouteWithoutParams()); -<<<<<<< HEAD Navigation.navigate(ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy?.type ?? CONST.POLICY.TYPE.PERSONAL, iouTransactionID, report?.reportID, activeRoute)); -======= - Navigation.navigate(ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy.type, iouTransactionID, report?.reportID, activeRoute)); ->>>>>>> main } };