From 437c405c7455f58864b2b94100b6b97db839553b Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Mon, 28 Aug 2023 22:38:38 +0100
Subject: [PATCH] Removed the abandon popup when not in exam mode

---
 src/pages/exam.tsx      | 26 ++++++++++++++------------
 src/pages/exercises.tsx | 26 ++++++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/pages/exam.tsx b/src/pages/exam.tsx
index 6b8503e4..734e2ecd 100644
--- a/src/pages/exam.tsx
+++ b/src/pages/exam.tsx
@@ -320,21 +320,23 @@ export default function Page() {
 				<Layout
 					user={user}
 					className="justify-between"
-					focusMode={selectedModules.length !== 0}
+					focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length}
 					onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}>
 					<>
 						{renderScreen()}
-						<AbandonPopup
-							isOpen={showAbandonPopup}
-							abandonPopupTitle="Leave Exercise"
-							abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
-							abandonConfirmButtonText="Confirm"
-							onAbandon={() => {
-								reset();
-								setShowAbandonPopup(false);
-							}}
-							onCancel={() => setShowAbandonPopup(false)}
-						/>
+						{!showSolutions && moduleIndex < selectedModules.length && (
+							<AbandonPopup
+								isOpen={showAbandonPopup}
+								abandonPopupTitle="Leave Exercise"
+								abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
+								abandonConfirmButtonText="Confirm"
+								onAbandon={() => {
+									reset();
+									setShowAbandonPopup(false);
+								}}
+								onCancel={() => setShowAbandonPopup(false)}
+							/>
+						)}
 					</>
 				</Layout>
 			)}
diff --git a/src/pages/exercises.tsx b/src/pages/exercises.tsx
index 214be631..a0b14a86 100644
--- a/src/pages/exercises.tsx
+++ b/src/pages/exercises.tsx
@@ -323,21 +323,23 @@ export default function Page() {
 				<Layout
 					user={user}
 					className="justify-between"
-					focusMode={selectedModules.length !== 0}
+					focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length}
 					onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}>
 					<>
 						{renderScreen()}
-						<AbandonPopup
-							isOpen={showAbandonPopup}
-							abandonPopupTitle="Leave Exercise"
-							abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
-							abandonConfirmButtonText="Confirm"
-							onAbandon={() => {
-								reset();
-								setShowAbandonPopup(false);
-							}}
-							onCancel={() => setShowAbandonPopup(false)}
-						/>
+						{!showSolutions && moduleIndex < selectedModules.length && (
+							<AbandonPopup
+								isOpen={showAbandonPopup}
+								abandonPopupTitle="Leave Exercise"
+								abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
+								abandonConfirmButtonText="Confirm"
+								onAbandon={() => {
+									reset();
+									setShowAbandonPopup(false);
+								}}
+								onCancel={() => setShowAbandonPopup(false)}
+							/>
+						)}
 					</>
 				</Layout>
 			)}