VPS-79/Make scenario desync less frightening

frontend/src/features/playScenario/PlayScenarioPage.jsx

@@ -1,6 +1,7 @@
 import { useContext, useState, useEffect } from "react";
 import { useParams, useHistory } from "react-router-dom";
 import axios from "axios";
+import toast from "react-hot-toast";
 
 import AuthenticationContext from "context/AuthenticationContext";
 import { usePost } from "hooks/crudHooks";
@@ -51,10 +52,18 @@ export default function PlayScenarioPage() {
   const [addFlags, setAddFlags] = useState([]);
   const [removeFlags, setRemoveFlags] = useState([]);
 
+  const reload = () => {
+    setPrevious(null);
+    history.replace(`/play/${scenarioId}/singleplayer`);
+  };
+
   const handleError = (error) => {
     if (!error) return;
     if (error.status === 409) {
-      history.push(`/play/${scenarioId}/desync`);
+      reload();
+      toast.success(
+        "A move from somewhere else was made, but you're back on track!"
+      );
     } else {
       history.push(`/play/${scenarioId}/error`);
     }
@@ -93,9 +102,7 @@ export default function PlayScenarioPage() {
       return;
     }
 
-    console.log("reset");
-    setPrevious(null);
-    history.replace(`/play/${scenarioId}/singleplayer`);
+    reload();
   };
 
   if (loading) return <LoadingPage text="Loading Scene..." />;

frontend/src/features/playScenario/PlayScenarioPageMulti.jsx

@@ -69,10 +69,18 @@ export default function PlayScenarioPageMulti({ group }) {
   const [removeFlags, setRemoveFlags] = useState([]);
   const [resources, setResources] = useState([]);
 
+  const reload = () => {
+    setPrevious(null);
+    history.replace(`/play/${scenarioId}/multiplayer`);
+  };
+
   const handleError = (error) => {
     if (!error) return;
     if (error.status === 409) {
-      history.push(`/play/${scenarioId}/desync`);
+      reload();
+      toast.success(
+        "Someone else made a move first, but you're back on track!"
+      );
     } else if (error.status === 403) {
       const roles = JSON.stringify(error.meta.roles_with_access);
       history.push(`/play/${scenarioId}/invalid-role?roles=${roles}`);
@@ -115,8 +123,7 @@ export default function PlayScenarioPageMulti({ group }) {
 
       setAddFlags([]);
       setRemoveFlags([]);
-      setPrevious(null);
-      history.replace(`/play/${scenarioId}/multiplayer`);
+      reload();
     } catch (error) {
       console.error("Error during reset:", error);
     }