fix merge conflict

kmbcook · Apr 19, 2024 · 9802487 · 9802487
1 parent 13af897
commit 9802487
Showing 1 changed file with 0 additions and 8 deletions.
diff --git 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
         }
     };