From 2df0b4c3f131d529b42fde0c442fd487cffcb492 Mon Sep 17 00:00:00 2001
From: Roba Boru <robab@ethiopianairines.com>
Date: Sat, 11 Jul 2026 01:09:40 +0300
Subject: [PATCH] Fix oassenger information back button redirect url issue

---
 .../portal/src/app/booking/passengers/page.tsx        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
index 34cf1fe5d..64f19fdb4 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/passengers/page.tsx
@@ -679,7 +679,7 @@ type FormData = z.infer<ReturnType<typeof createFormSchema>>;
 
 function PassengersForm() {
   const router = useRouter();
-  const { searchCriteria, passengers: storedPassengers, setPassengers, setCreateAccount } = useBookingStore();
+  const { searchCriteria, passengers: storedPassengers, setPassengers, setCreateAccount, packageId } = useBookingStore();
   const { user, isAuthenticated, updateUser } = useAuthStore();
   const isInitialized = useAuthStore((s) => s.isInitialized);
   const [faydaEnabled, setFaydaEnabled] = useState(true);
@@ -1474,6 +1474,15 @@ function PassengersForm() {
 
             <div className="flex gap-4">
               <button type="button" onClick={() => {
+                // Package bookings skip results/seats entirely — they land here directly
+                // from /packages/[id] via a plain router.push. Hardcoding a return to
+                // /booking/results would be wrong for that flow (it was never visited), so
+                // use real browser back navigation instead, which lands exactly back on the
+                // package page with its original URL/state intact.
+                if (packageId) {
+                  router.back();
+                  return;
+                }
                 const params = new URLSearchParams({
                   origin: searchCriteria.originStationId,
                   destination: searchCriteria.destinationStationId,