refactor(config): remove special handling for font size 15 (@fehmer) (monkeytypegame#6693)

Author: fehmer

frontend/__tests__/root/config.spec.ts

@@ -443,12 +443,6 @@ describe("Config", () => {
 
     //gets converted
     expect(Config.setFontSize(-1)).toBe(true);
-    expect(Config.setFontSize("1" as any)).toBe(true);
-    expect(Config.setFontSize("125" as any)).toBe(true);
-    expect(Config.setFontSize("15" as any)).toBe(true);
-    expect(Config.setFontSize("2" as any)).toBe(true);
-    expect(Config.setFontSize("3" as any)).toBe(true);
-    expect(Config.setFontSize("4" as any)).toBe(true);
 
     expect(Config.setFontSize(0)).toBe(false);
     expect(Config.setFontSize("5" as any)).toBe(false);

frontend/__tests__/utils/config.spec.ts

@@ -193,6 +193,22 @@ describe("config.ts", () => {
             favThemes: ["80s_after_dark", "luna", "pulse"],
           },
         },
+        {
+          given: { fontSize: "2" },
+          expected: { fontSize: 2 },
+        },
+        {
+          given: { fontSize: "15" },
+          expected: { fontSize: 1.5 },
+        },
+        {
+          given: { fontSize: "125" },
+          expected: { fontSize: 1.25 },
+        },
+        {
+          given: { fontSize: 15 },
+          expected: { fontSize: 15 },
+        },
       ])(`$given`, ({ given, expected }) => {
         const description = `given: ${JSON.stringify(
           given

frontend/src/ts/config.ts

@@ -1770,34 +1770,13 @@ export function setFontSize(
   if (fontSize < 0) {
     fontSize = 1;
   }
-  if (
-    typeof fontSize === "string" &&
-    ["1", "125", "15", "2", "3", "4"].includes(fontSize)
-  ) {
-    if (fontSize === "125") {
-      fontSize = 1.25;
-    } else if (fontSize === "15") {
-      fontSize = 1.5;
-    } else {
-      fontSize = parseInt(fontSize);
-    }
-  }
 
   if (
     !isConfigValueValid("font size", fontSize, ConfigSchemas.FontSizeSchema)
   ) {
     return false;
   }
 
-  // i dont know why the above check is not enough
-  // some people are getting font size 15 when it should be converted to 1.5
-  // after converting from the string to float system
-
-  // keeping this in for now, if you want a big font go 14.9 or something
-  if (fontSize === 15) {
-    fontSize = 1.5;
-  }
-
   config.fontSize = fontSize;
 
   $("#caret, #paceCaret, #liveStatsMini, #typingTest, #wordsInput").css(

frontend/src/ts/utils/config.ts

@@ -142,5 +142,19 @@ export function replaceLegacyValues(
       configObj.indicateTypos === false ? "off" : "replace";
   }
 
+  if (typeof configObj.fontSize === "string") {
+    //legacy values use strings
+    const oldValue = configObj.fontSize;
+    let newValue = parseInt(oldValue);
+
+    if (oldValue === "125") {
+      newValue = 1.25;
+    } else if (oldValue === "15") {
+      newValue = 1.5;
+    }
+
+    configObj.fontSize = newValue;
+  }
+
   return configObj;
 }