Merge pull request #521 from LiamMorrow/fix-decimals

LiamMorrow · web-flow · commit d2d154039226 · 2025-08-20T04:51:05.000+10:00
diff --git a/app/app.json b/app/app.json
@@ -32,7 +32,8 @@
           "project": "app",
           "organization": "liftlog"
         }
-      ]
+      ],
+      "expo-localization"
     ],
     "experiments": {
       "typedRoutes": true,
diff --git a/app/components/presentation/bodyweight-stat-graph-card.tsx b/app/components/presentation/bodyweight-stat-graph-card.tsx
@@ -58,5 +58,5 @@ export default function BodyweightStatGraphCard(props: {
  * @param value
  */
 function formatNumber(value: number) {
-  return value % 1 === 0 ? value.toString() : value.toFixed(2);
+  return value.toLocaleString(undefined, { maximumFractionDigits: 2 });
 }
diff --git a/app/components/presentation/editable-incrementer.tsx b/app/components/presentation/editable-incrementer.tsx
@@ -1,3 +1,7 @@
+import {
+  localeFormatBigNumber,
+  localeParseBigNumber,
+} from '@/utils/locale-bignumber';
 import BigNumber from 'bignumber.js';
 import { useEffect, useState } from 'react';
 import { View } from 'react-native';
@@ -14,7 +18,7 @@ interface EditableIncrementerProps {
 
 export default function EditableIncrementer(props: EditableIncrementerProps) {
   const { increment, label, value, onChange } = props;
-  const [text, setText] = useState(props.value.toFormat());
+  const [text, setText] = useState(localeFormatBigNumber(props.value));
   const [editorValue, setEditorValue] = useState<BigNumber>(value);
 
   const handleTextChange = (text: string) => {
@@ -24,14 +28,14 @@ export default function EditableIncrementer(props: EditableIncrementerProps) {
       return;
     }
 
-    const parsed = BigNumber(text);
+    const parsed = localeParseBigNumber(text);
     if (!parsed.isNaN()) {
       setEditorValue(parsed);
       return;
     }
   };
   useEffect(() => {
-    setText(value?.toFormat() ?? '');
+    setText(localeFormatBigNumber(value));
     setEditorValue(value);
   }, [value]);
 
diff --git a/app/components/presentation/exercise-stat-graph-card.tsx b/app/components/presentation/exercise-stat-graph-card.tsx
@@ -71,5 +71,5 @@ export default function ExerciseStatGraphCard(props: {
  * @param value
  */
 function formatNumber(value: number) {
-  return value % 1 === 0 ? value.toString() : value.toFixed(2);
+  return value.toLocaleString(undefined, { maximumFractionDigits: 2 });
 }
diff --git a/app/components/presentation/exercise-summary.tsx b/app/components/presentation/exercise-summary.tsx
@@ -2,6 +2,7 @@ import { SurfaceText } from '@/components/presentation/surface-text';
 import WeightFormat from '@/components/presentation/weight-format';
 import { spacing, useAppTheme } from '@/hooks/useAppTheme';
 import { RecordedExercise } from '@/models/session-models';
+import { localeFormatBigNumber } from '@/utils/locale-bignumber';
 import { DateTimeFormatter } from '@js-joda/core';
 import BigNumber from 'bignumber.js';
 import Enumerable from 'linq';
@@ -167,7 +168,7 @@ function getPlannedChipData(
   exercise: RecordedExercise,
 ): PotentialSetChipData[] {
   return Enumerable.from(exercise.potentialSets)
-    .groupBy((x) => x.weight.toString())
+    .groupBy((x) => localeFormatBigNumber(x.weight))
     .select((x) => ({
       repTarget: exercise.blueprint.repsPerSet,
       numSets: x.count(),
diff --git a/app/components/presentation/weight-dialog.tsx b/app/components/presentation/weight-dialog.tsx
@@ -1,6 +1,10 @@
 import WeightFormat from '@/components/presentation/weight-format';
 import { spacing } from '@/hooks/useAppTheme';
 import { useWeightSuffix } from '@/hooks/useWeightSuffix';
+import {
+  localeFormatBigNumber,
+  localeParseBigNumber,
+} from '@/utils/locale-bignumber';
 import { T } from '@tolgee/react';
 import BigNumber from 'bignumber.js';
 import { ReactNode, useEffect, useState } from 'react';
@@ -35,14 +39,14 @@ type WeightDialogProps = {
 
 export default function WeightDialog(props: WeightDialogProps) {
   const theme = useTheme();
-  const [text, setText] = useState(props.weight?.toFormat() ?? '');
+  const [text, setText] = useState(localeFormatBigNumber(props.weight));
   const [editorWeight, setEditorWeight] = useState<BigNumber | undefined>(
     props.weight,
   );
   const weightSuffix = useWeightSuffix();
 
   useEffect(() => {
-    setText(props.weight?.toFormat() ?? '');
+    setText(localeFormatBigNumber(props.weight));
     setEditorWeight(props.weight);
   }, [props.open, props.weight, setText]);
 
@@ -55,14 +59,14 @@ export default function WeightDialog(props: WeightDialogProps) {
       return;
     }
     setEditorWeight(editorWeight.plus(nonZeroIncrement));
-    setText(editorWeight.plus(nonZeroIncrement).toFormat());
+    setText(localeFormatBigNumber(editorWeight.plus(nonZeroIncrement)));
   };
   const decrementWeight = () => {
     if (editorWeight === undefined) {
       return;
     }
     setEditorWeight(editorWeight.minus(nonZeroIncrement));
-    setText(editorWeight.minus(nonZeroIncrement).toFormat());
+    setText(localeFormatBigNumber(editorWeight.minus(nonZeroIncrement)));
   };
 
   const handleTextChange = (text: string) => {
@@ -72,8 +76,8 @@ export default function WeightDialog(props: WeightDialogProps) {
       return;
     }
 
-    if (!BigNumber(text).isNaN()) {
-      setEditorWeight(new BigNumber(text));
+    if (!localeParseBigNumber(text).isNaN()) {
+      setEditorWeight(localeParseBigNumber(text));
       return;
     }
   };
diff --git a/app/components/presentation/weight-format.tsx b/app/components/presentation/weight-format.tsx
@@ -5,6 +5,7 @@ import {
   useAppTheme,
 } from '@/hooks/useAppTheme';
 import { useWeightSuffix } from '@/hooks/useWeightSuffix';
+import { localeFormatBigNumber } from '@/utils/locale-bignumber';
 import BigNumber from 'bignumber.js';
 import { Text, TextStyle } from 'react-native';
 
@@ -16,7 +17,8 @@ interface WeightFormatProps {
   fontWeight?: TextStyle['fontWeight'];
 }
 export default function WeightFormat(props: WeightFormatProps) {
-  const weightDisplay = props.weight?.decimalPlaces(4).toFormat() ?? '-';
+  const weightDisplay =
+    localeFormatBigNumber(props.weight?.decimalPlaces(4)) || '-';
   const suffix = useWeightSuffix();
   const { colors } = useAppTheme();
 
diff --git a/app/ios/LiftLog.xcodeproj/project.pbxproj b/app/ios/LiftLog.xcodeproj/project.pbxproj
@@ -291,6 +291,7 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/ExpoConstants_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/EXNotifications/ExpoNotifications_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoFileSystem/ExpoFileSystem_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/ExpoLocalization/ExpoLocalization_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/PurchasesHybridCommon/PurchasesHybridCommon.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
@@ -312,6 +313,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoNotifications_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoLocalization_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/PurchasesHybridCommon.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -290,6 +290,8 @@ PODS:
     - ExpoModulesCore
   - ExpoLinking (7.1.7):
     - ExpoModulesCore
+  - ExpoLocalization (16.1.6):
+    - ExpoModulesCore
   - ExpoModulesCore (2.5.0):
     - DoubleConversion
     - glog
@@ -2489,6 +2491,7 @@ DEPENDENCIES:
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoLinearGradient (from `../node_modules/expo-linear-gradient/ios`)
   - ExpoLinking (from `../node_modules/expo-linking/ios`)
+  - ExpoLocalization (from `../node_modules/expo-localization/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - ExpoSharing (from `../node_modules/expo-sharing/ios`)
   - ExpoSplashScreen (from `../node_modules/expo-splash-screen/ios`)
@@ -2630,6 +2633,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-linear-gradient/ios"
   ExpoLinking:
     :path: "../node_modules/expo-linking/ios"
+  ExpoLocalization:
+    :path: "../node_modules/expo-localization/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
   ExpoSharing:
@@ -2824,6 +2829,7 @@ SPEC CHECKSUMS:
   ExpoKeepAwake: bf0811570c8da182bfb879169437d4de298376e7
   ExpoLinearGradient: 7734c8059972fcf691fb4330bcdf3390960a152d
   ExpoLinking: d5c183998ca6ada66ff45e407e0f965b398a8902
+  ExpoLocalization: 999a1ff61a7f5917d65c2bd9234883009019ca9f
   ExpoModulesCore: 00a1b5c73248465bd0b93f59f8538c4573dac579
   ExpoSharing: b0377be82430d07398c6a4cd60b5a15696accbd3
   ExpoSplashScreen: 0ad5acac1b5d2953c6e00d4319f16d616f70d4dd
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -86,7 +86,8 @@
     "react-redux": "^9.2.0",
     "ts-pattern": "^5.6.2",
     "use-debounce": "^10.0.4",
-    "uuid": "^11.1.0"
+    "uuid": "^11.1.0",
+    "expo-localization": "~16.1.6"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
diff --git a/app/utils/locale-bignumber.ts b/app/utils/locale-bignumber.ts
@@ -0,0 +1,23 @@
+import BigNumber from 'bignumber.js';
+import { getLocales } from 'expo-localization';
+
+function localeUsesComma(): boolean {
+  return getLocales()[0].decimalSeparator === ',';
+}
+
+export function localeParseBigNumber(numStr: string): BigNumber {
+  if (localeUsesComma()) {
+    return new BigNumber(numStr.replace('.', '').replace(',', '.'));
+  }
+  return new BigNumber(numStr);
+}
+
+export function localeFormatBigNumber(num: BigNumber | undefined): string {
+  if (!num) {
+    return '';
+  }
+  if (localeUsesComma()) {
+    return num.toFormat({ decimalSeparator: ',' });
+  }
+  return num.toFormat();
+}

Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,5 @@ export default function BodyweightStatGraphCard(props: {`
`58`	`58`	`* @param value`
`59`	`59`	`*/`
`60`	`60`	`function formatNumber(value: number) {`
`61`		`- return value % 1 === 0 ? value.toString() : value.toFixed(2);`
	`61`	`+ return value.toLocaleString(undefined, { maximumFractionDigits: 2 });`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,5 @@ export default function ExerciseStatGraphCard(props: {`
`71`	`71`	`* @param value`
`72`	`72`	`*/`
`73`	`73`	`function formatNumber(value: number) {`
`74`		`- return value % 1 === 0 ? value.toString() : value.toFixed(2);`
	`74`	`+ return value.toLocaleString(undefined, { maximumFractionDigits: 2 });`
`75`	`75`	`}`