diff --git a/src/pages/BattlePage.jsx b/src/pages/BattlePage.jsx
index e726ca6..824e4ee 100644
--- a/src/pages/BattlePage.jsx
+++ b/src/pages/BattlePage.jsx
@@ -6,6 +6,7 @@ import Footer from './components/layout/Footer';
 import SettingsModal from './components/ui/SettingsModal';
 import QueueModal from './components/ui/QueueModal';
 import { useQueueSSE } from './useQueueSSE';
+import {useMatchStore} from "./useMatchStore.js";
 import './BattlePage.css';
 
 if (typeof global === 'undefined') {
@@ -16,10 +17,15 @@ export default function BattlePage() {
     const navigate = useNavigate();
     const { logout } = useUser();
     const [showSettings, setShowSettings] = useState(false);
-
+    const resetStore = useMatchStore((state) => state.resetStore);
     const { isModalOpen, queueSize, waitSeconds, isConnecting, enterQueue, leaveQueue } =
         useQueueSSE();
 
+    const enterQueueAndResetStore = () => {
+        resetStore();
+        enterQueue();
+    }
+
     const handleLogout = () => {
         logout();
         navigate('/login');
@@ -37,7 +43,7 @@ export default function BattlePage() {
 
                 <button
                     className="btn-battle"
-                    onClick={enterQueue}
+                    onClick={enterQueueAndResetStore}
                     disabled={isConnecting}
                 >
                     {isConnecting ? 'Подключение...' : 'В БОЙ!'}
diff --git a/src/pages/DraftPage.jsx b/src/pages/DraftPage.jsx
index 5556aa1..a4a0ee9 100644
--- a/src/pages/DraftPage.jsx
+++ b/src/pages/DraftPage.jsx
@@ -76,7 +76,7 @@ const DraftPage = () => {
                         whiteSpace: 'nowrap'
                     }}
                 >
-                    {isMyTurn ? "Ходите вы" : "Ходит оппонент"}
+                    {isMyTurn ? "Вы баните опцию" : "Оппонент банит опцию"}
                 </div>
             </header>
 
@@ -103,30 +103,30 @@ const DraftPage = () => {
 
                                 <div className="draft-options-list">
                                     {options && options.length > 0 ? (
-                                        options.map(({ option, banned }) => {
-                                            const isClickable = active && !banned;
-
-                                            // Определяем классы стилей для кнопки
-                                            let btnClass = "draft-ban-btn";
-
-                                            if (banned) {
-                                                btnClass += " banned";
-                                            } else if (isCategoryFinished) {
-                                                // Если категория завершена и опция не забанена — это наш победитель!
-                                                btnClass += " selected-winner";
-                                            }
-
-                                            return (
-                                                <button
-                                                    key={option}
-                                                    disabled={!isClickable}
-                                                    onClick={() => sendBan(category, option)}
-                                                    className={btnClass}
-                                                >
-                                                    {banned ? `${option}` : isCategoryFinished ? `${option}` : `${option}`}
-                                                </button>
-                                            );
-                                        })
+                                        // Копируем массив через [...] и сортируем по свойству option (строка с именем)
+                                        [...options]
+                                            .sort((a, b) => a.option.localeCompare(b.option))
+                                            .map(({ option, banned }) => {
+                                                const isClickable = active && !banned;
+
+                                                let btnClass = "draft-ban-btn";
+                                                if (banned) {
+                                                    btnClass += " banned";
+                                                } else if (isCategoryFinished) {
+                                                    btnClass += " selected-winner";
+                                                }
+
+                                                return (
+                                                    <button
+                                                        key={option}
+                                                        disabled={!isClickable}
+                                                        onClick={() => sendBan(category, option)}
+                                                        className={btnClass}
+                                                    >
+                                                        {option}
+                                                    </button>
+                                                );
+                                            })
                                     ) : (
                                         <p className="muted">Опций не осталось</p>
                                     )}
diff --git a/src/pages/WorkspacePage.jsx b/src/pages/WorkspacePage.jsx
index e58fb85..d532e30 100644
--- a/src/pages/WorkspacePage.jsx
+++ b/src/pages/WorkspacePage.jsx
@@ -3,7 +3,6 @@ import SettingsModal from './components/ui/SettingsModal';
 import { useState, useEffect } from 'react';
 import { PanelGroup, PanelResizeHandle } from "react-resizable-panels";
 import {useNavigate, useParams} from 'react-router-dom';
-import { useParcelPolling } from './useParcelPolling';
 import Header from './components/layout/Header';
 import Footer from './components/layout/Footer';
 import LeftWorkspace from './components/workspace/LeftWorkspace';
@@ -11,6 +10,7 @@ import RightWorkspace from './components/workspace/RightWorkspace';
 import './WorkspacePage.css';
 import MatchResultOverlay from './MatchResultOverlay';
 import { useMatchStore } from "./useMatchStore.js";
+import {useMatchSession} from "./useMatchSession.js";
 
 function WorkspacePage() {
   const {matchId} = useParams();
@@ -19,7 +19,7 @@ function WorkspacePage() {
   const [isDarkMode, setIsDarkMode] = useState(true);
   const [isSwapped, setIsSwapped] = useState(false);
   const [showSettings, setShowSettings] = useState(false);
-  const { submissions } = useParcelPolling();
+  const { userSubmissions } = useMatchSession();
 
   const matchResult = useMatchStore((state) => state.matchResult);
 
@@ -37,48 +37,48 @@ function WorkspacePage() {
   };
 
   return (
-    <div className="layout-container">
-      <Header onSettingsClick={() => setShowSettings(true)} />
+      <div className="layout-container">
+        <Header onSettingsClick={() => setShowSettings(true)} />
 
-      <main className="workspace">
-        <PanelGroup direction="horizontal">
-          {isSwapped ? (
-            <RightWorkspace position="left" submissions={submissions}  />
-          ) : (
-            <LeftWorkspace isDarkMode={isDarkMode} position="left" submissions = {submissions} matchId = {matchId} />
-          )}
-          
-          <PanelResizeHandle className="resizer-vertical">
-            <div className="resizer-line-vertical"></div>
-          </PanelResizeHandle>
-          
-          {isSwapped ? (
-            <LeftWorkspace isDarkMode={isDarkMode} position="right" />
-          ) : (
-            <RightWorkspace position="right" submissions={submissions} />
-          )}
-        </PanelGroup>
-      </main>
+        <main className="workspace">
+          <PanelGroup direction="horizontal">
+            {isSwapped ? (
+                <RightWorkspace position="left" submissions={userSubmissions}  />
+            ) : (
+                <LeftWorkspace isDarkMode={isDarkMode} position="left" submissions = {userSubmissions} matchId = {matchId} />
+            )}
 
-      <Footer />
+            <PanelResizeHandle className="resizer-vertical">
+              <div className="resizer-line-vertical"></div>
+            </PanelResizeHandle>
 
-      <SettingsModal 
-        isOpen={showSettings}
-        onClose={() => setShowSettings(false)}
-        onLogout={handleLogout}
-        themeConfig={{ isDarkMode, setIsDarkMode }}
-        workspaceConfig={{ isSwapped, setIsSwapped }}
-      />
+            {isSwapped ? (
+                <LeftWorkspace isDarkMode={isDarkMode} position="right" />
+            ) : (
+                <RightWorkspace position="right" submissions={userSubmissions} />
+            )}
+          </PanelGroup>
+        </main>
 
-      {matchResult && (
-          <MatchResultOverlay
-              outcome={matchResult.outcome}
-              newRating={matchResult.newRating}
-              ratingDelta={matchResult.ratingDelta}
-          />
-      )}
+        <Footer />
 
-    </div>
+        <SettingsModal
+            isOpen={showSettings}
+            onClose={() => setShowSettings(false)}
+            onLogout={handleLogout}
+            themeConfig={{ isDarkMode, setIsDarkMode }}
+            workspaceConfig={{ isSwapped, setIsSwapped }}
+        />
+
+        {matchResult && (
+            <MatchResultOverlay
+                outcome={matchResult.outcome}
+                newRating={matchResult.newRating}
+                ratingDelta={matchResult.ratingDelta}
+            />
+        )}
+
+      </div>
   );
 }
 
diff --git a/src/pages/useMatchSession.js b/src/pages/useMatchSession.js
index 46a6a58..f408ed3 100644
--- a/src/pages/useMatchSession.js
+++ b/src/pages/useMatchSession.js
@@ -16,6 +16,11 @@ export const useMatchSession = (matchId) => {
     const [opponent, setOpponent] = useState(null);
     const {user} = useUser();
     const [sessionData, setSessionData] = useState(null);
+    const matchSubmissions = useMatchStore((state) => state.matchSubmissions);
+    const userSubmissions = matchSubmissions
+        .filter(sub => sub.userId === user?.id);
+    console.log(`user id : ${user?.id}`);
+
     useEffect(() => {
         // eslint-disable-next-line react-hooks/set-state-in-effect
         setSessionData(draftSessionDTO?.draftSession);
@@ -27,7 +32,11 @@ export const useMatchSession = (matchId) => {
         const amIFirstUser = user.id === sessionData.firstUserId;
         const opponentId = amIFirstUser ? sessionData.secondUserId : sessionData.firstUserId;
 
-        if (!opponentId) return;
+        if (!opponentId) {
+            console.log(`session data: ${sessionData}`);
+            console.log(`opponent id : ${opponentId}`);
+            return;
+        };
 
         api.get(`user/info/${opponentId}`)
             .then(response => {
@@ -51,9 +60,21 @@ export const useMatchSession = (matchId) => {
         }
     }, [isRedirect, matchId, navigate, resetStore]);
 
+    useEffect(() => {
+        if (matchSubmissions.length === 0) return;
+
+        const lastSubmission = matchSubmissions[0];
+        console.log(`submission id: ${lastSubmission.userId}`);
+        if (lastSubmission.userId !== user?.id) {
+
+            toast.success("Оппонент попытался решить задачу");
+        }
+
+    }, [matchSubmissions.length]);
+
     const sendBan = (category, value) => {
         publish(`/app/${matchId}/ban`, {category: category, banObject: value});
     };
 
-    return {sessionData, opponent, error, sendBan, isConnected};
+    return {sessionData, opponent, error, sendBan, isConnected, userSubmissions};
 };
diff --git a/src/pages/useMatchStore.js b/src/pages/useMatchStore.js
index 85c294a..8c209d6 100644
--- a/src/pages/useMatchStore.js
+++ b/src/pages/useMatchStore.js
@@ -6,6 +6,7 @@ export const useMatchStore = create((set) => ({
     error: { stage: null, message: null },
     matchStarted: false,
     matchResult: null,
+    matchSubmissions : [],
 
     handleIncomingMessage: (payload) => {
         switch (payload.status) {
@@ -18,6 +19,12 @@ export const useMatchStore = create((set) => ({
             case 'MATCH_FINISHED':
                 set({ matchResult: payload.payload });
                 break;
+
+            case 'SUBMISSION':
+                set((state) => ({
+                    matchSubmissions: [ payload.payload, ...state.matchSubmissions]
+                }));
+                break;
         }
     },
 
@@ -25,5 +32,5 @@ export const useMatchStore = create((set) => ({
         set({ error: { stage: null, message: payload.message } });
     },
 
-    resetStore: () => set({ matchStarted: null, error: null, matchResult: null }),
+    resetStore: () => set({ matchStarted: false, error: {stage : null, message : null}, matchResult: null, draftSessionDTO : null, matchSubmissions : [] }),
 }));
\ No newline at end of file