Fix issue with converted integers that ended with 0

hoovercj · Feb 28, 2024 · 0908252 · 0908252
1 parent 267635f
commit 0908252
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/lib/formatter.test.ts b/src/lib/formatter.test.ts
@@ -17,6 +17,7 @@ describe("convertWorkoutDescriptionUnits", () => {
         expect(convertWorkoutDescriptionUnits("123miles", "miles", "kilometers")).toBe("198kilometers");
         expect(convertWorkoutDescriptionUnits("123 mi", "miles", "kilometers")).toBe("198 km");
         expect(convertWorkoutDescriptionUnits("123mi", "miles", "kilometers")).toBe("198km");
+        expect(convertWorkoutDescriptionUnits("6 miles", "miles", "kilometers")).toBe("10 kilometers");
         expect(convertWorkoutDescriptionUnits("198 kilometers", "kilometers", "miles")).toBe("123 miles");
         expect(convertWorkoutDescriptionUnits("198kilometers", "kilometers", "miles")).toBe("123miles");
         expect(convertWorkoutDescriptionUnits("198 km", "kilometers", "miles")).toBe("123 mi");

diff --git a/src/lib/formatter.ts b/src/lib/formatter.ts
@@ -97,8 +97,9 @@ const convertDistance = (input: string, inputUnits: Units, outputUnits: Units):
         fixedInput = fixedInput.substring(1);
     }
 
+    const fixedInputHasDecimal = fixedInput.indexOf(".") >= 0;
     // Only preserve a trailing 0 if the input had a trailing zero
-    if (fixedInput.endsWith("0") && !input.endsWith("0")) {
+    if (fixedInputHasDecimal && fixedInput.endsWith("0") && !input.endsWith("0")) {
         fixedInput = fixedInput.substring(0, fixedInput.length - 1);
     }