Rearrange some settings

src/GameOptions/ui/CurrentOptionsPage.tsx

@@ -150,6 +150,35 @@ export const CurrentOptionsPage = (props: IProps): React.ReactElement => {
             marks
           />
         </>
+        <OptionSwitch
+          checked={Settings.SuppressSavedGameToast}
+          onChange={(newValue) => (Settings.SuppressSavedGameToast = newValue)}
+          text="Suppress Auto-Save Game Toast"
+          tooltip={<>If this is set, there will be no "Game Saved!" toast appearing after an auto-save.</>}
+        />
+        <OptionSwitch
+          checked={Settings.SuppressAutosaveDisabledWarnings}
+          onChange={(newValue) => (Settings.SuppressAutosaveDisabledWarnings = newValue)}
+          text="Suppress Auto-Save Disabled Warning"
+          tooltip={<>If this is set, there will be no warning triggered when auto-save is disabled (at 0).</>}
+        />
+        <OptionSwitch
+          checked={Settings.SaveGameOnFileSave}
+          onChange={(newValue) => (Settings.SaveGameOnFileSave = newValue)}
+          text="Save game on file save"
+          tooltip={<>Save your game any time a file is saved in the script editor.</>}
+        />
+        <OptionSwitch
+          checked={Settings.ExcludeRunningScriptsFromSave}
+          onChange={(newValue) => (Settings.ExcludeRunningScriptsFromSave = newValue)}
+          text="Exclude Running Scripts from Save"
+          tooltip={
+            <>
+              If this is set, the save file will exclude all running scripts. This is only useful if your save is
+              lagging a lot. You'll have to restart your script every time you launch the game.
+            </>
+          }
+        />
       </GameOptionsPage>
     ),
     [GameOptionsTab.INTERFACE]: (
@@ -192,28 +221,24 @@ export const CurrentOptionsPage = (props: IProps): React.ReactElement => {
             </Typography>
           }
         >
-          <span>
+          <TextField
-            <TextField
+            InputProps={{
-              InputProps={{
+              startAdornment: (
-                startAdornment: (
+                <Typography
-                  <Typography
+                  color={formatTime(timestampFormat) === "format error" && timestampFormat !== "" ? "error" : "success"}
-                    color={
+                >
-                      formatTime(timestampFormat) === "format error" && timestampFormat !== "" ? "error" : "success"
+                  Timestamp format:
-                    }
+                </Typography>
-                  >
+              ),
-                    Timestamp&nbsp;format:&nbsp;
+            }}
-                  </Typography>
+            value={timestampFormat}
-                ),
+            onChange={handleTimestampFormatChange}
-              }}
+            placeholder="yyyy-MM-dd hh:mm:ss"
-              value={timestampFormat}
+          />
-              onChange={handleTimestampFormatChange}
-              placeholder="yyyy-MM-dd hh:mm:ss"
-            />
-          </span>
         </Tooltip>
         <>
           <Tooltip title={<Typography>Sets the locale for displaying numbers.</Typography>}>
-            <Typography>Locale&nbsp;</Typography>
+            <Typography>Locale</Typography>
           </Tooltip>
           <Select value={locale} onChange={handleLocaleChange}>
             <MenuItem value="en">en</MenuItem>
@@ -282,24 +307,6 @@ export const CurrentOptionsPage = (props: IProps): React.ReactElement => {
           text="Suppress TIX messages"
           tooltip={<>If this is set, the stock market will never create any popup.</>}
         />
-        <OptionSwitch
-          checked={Settings.SuppressSavedGameToast}
-          onChange={(newValue) => (Settings.SuppressSavedGameToast = newValue)}
-          text="Suppress Auto-Save Game Toast"
-          tooltip={<>If this is set, there will be no "Game Saved!" toast appearing after an auto-save.</>}
-        />
-        <OptionSwitch
-          checked={Settings.SuppressAutosaveDisabledWarnings}
-          onChange={(newValue) => (Settings.SuppressAutosaveDisabledWarnings = newValue)}
-          text="Suppress Auto-Save Disabled Warning"
-          tooltip={<>If this is set, there will be no warning triggered when auto-save is disabled (at 0).</>}
-        />
-        <OptionSwitch
-          checked={Settings.SaveGameOnFileSave}
-          onChange={(newValue) => (Settings.SaveGameOnFileSave = newValue)}
-          text="Save game on file save"
-          tooltip={<>Save your game any time a file is saved in the script editor.</>}
-        />
         {props.player.bladeburner && (
           <OptionSwitch
             checked={Settings.SuppressBladeburnerPopup}
@@ -341,17 +348,6 @@ export const CurrentOptionsPage = (props: IProps): React.ReactElement => {
             </>
           }
         />
-        <OptionSwitch
-          checked={Settings.ExcludeRunningScriptsFromSave}
-          onChange={(newValue) => (Settings.ExcludeRunningScriptsFromSave = newValue)}
-          text="Exclude Running Scripts from Save"
-          tooltip={
-            <>
-              If this is set, the save file will exclude all running scripts. This is only useful if your save is
-              lagging a lot. You'll have to restart your script every time you launch the game.
-            </>
-          }
-        />
       </GameOptionsPage>
     ),
   };

src/GameOptions/ui/GameOptionsSidebar.tsx

@@ -192,7 +192,7 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => {
               After using this, save the game and then reload the page. This is different then normal kill in that
               normal kill will tell the script to shut down while force kill just removes the references to it (and it
               should crash on it's own). This will not remove the files on your computer. Just forcefully kill all
-              running instance of all scripts.
+              running instances of all scripts.
             </Typography>
           }
         >