From 0930ea9c2668bafe6db4c1b797fde92ddb1b04b8 Mon Sep 17 00:00:00 2001
From: root <root@cgvcpusuzr.local>
Date: Wed, 27 May 2026 14:06:54 +0000
Subject: [PATCH] fix: back button uses browser history instead of hardcoded
 /dashboard

---
 src/pages/GroupDetailPage.jsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/GroupDetailPage.jsx b/src/pages/GroupDetailPage.jsx
index 94bbe09..079f483 100644
--- a/src/pages/GroupDetailPage.jsx
+++ b/src/pages/GroupDetailPage.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams, useLocation } from "react-router-dom";
 import { OrderDetailPanel } from "../components/orders/OrderDetailPanel";
 import { Button } from "../components/UI/Button";
 import { Panel } from "../components/UI/Panel";
@@ -10,6 +10,7 @@ import { useOrderGroups } from "../hooks/useOrderGroups";
 export const GroupDetailPage = () => {
   const { groupId } = useParams();
   const navigate = useNavigate();
+  const location = useLocation();
   const { user } = useAuth();
   const userRole = user?.role;
 
@@ -48,10 +49,19 @@ export const GroupDetailPage = () => {
     allOrderGroups.find((g) => g.id === selectedOrderGroupId) ||
     null;
 
+  // Preserve the tab the user came from when going back
+  const handleGoBack = React.useCallback(() => {
+    if (window.history.length > 1) {
+      navigate(-1);
+    } else {
+      navigate("/dashboard");
+    }
+  }, [navigate]);
+
   return (
     <div className="mx-auto w-full max-w-3xl space-y-5">
       <div className="flex items-center justify-between">
-        <Button variant="ghost" onClick={() => navigate("/dashboard")} className="text-sm">
+        <Button variant="ghost" onClick={handleGoBack} className="text-sm">
           ← Назад к списку
         </Button>
       </div>
@@ -74,4 +84,4 @@ export const GroupDetailPage = () => {
       )}
     </div>
   );
-};
+};
\ No newline at end of file