Merge branch 'main' into unit-testing

bryanlundberg · Sep 8, 2024 · 4446f64 · 4446f64
2 parents 2f77aa2 + 2890ff9
commit 4446f64
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/hooks/useModalCube.ts b/src/hooks/useModalCube.ts
@@ -37,8 +37,6 @@ export default function useModalCube() {
   const [showDeleteConfirmation, setShowDeleteConfirmation] = useState(false);
   const [cubeData, setCubeData] = useState<DeleteCubeDetails | null>(null);
 
-  const defaultCubeId = loadSettings().preferences.defaultCube.cube?.id;
-
   useEscape(() => setModalOpen(false));
 
   const handleClickRadio = (category: Categories) => {
@@ -94,6 +92,7 @@ export default function useModalCube() {
       }
     }
 
+    const defaultCubeId = loadSettings().preferences.defaultCube.cube?.id;
     if (editingCube.id === defaultCubeId) {
       const currentSettings = loadSettings();
       if (currentSettings.preferences.defaultCube.cube) {
@@ -168,7 +167,7 @@ export default function useModalCube() {
       setNewScramble(null);
       setTimerStatistics();
     }
-
+    const defaultCubeId = loadSettings().preferences.defaultCube.cube?.id;
     if (editingCube.id === defaultCubeId) {
       const currentSettings = loadSettings();
       currentSettings.preferences.defaultCube.cube = null;