Skip to content

A local-first personal finance app

Fix loading of number format on initial app startup (#4038)

Julian Dominguez-Schatzded2f39e1307
diff --git a/packages/desktop-client/src/components/spreadsheet/useFormat.ts b/packages/desktop-client/src/components/spreadsheet/useFormat.ts
index b5e13f6c5d..2f4af2d201 100644
--- a/packages/desktop-client/src/components/spreadsheet/useFormat.ts
+++ b/packages/desktop-client/src/components/spreadsheet/useFormat.ts
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo } from 'react';
import {
getNumberFormat,
integerToCurrency,
- isNumberFormat,
+ parseNumberFormat,
setNumberFormat,
} from 'loot-core/src/shared/util';
@@ -64,10 +64,7 @@ export function useFormat() {
const [hideFraction] = useSyncedPref('hideFraction');
const config = useMemo(
- () => ({
- format: isNumberFormat(numberFormat) ? numberFormat : 'comma-dot',
- hideFraction: String(hideFraction) === 'true',
- }),
+ () => parseNumberFormat({ format: numberFormat, hideFraction }),
[numberFormat, hideFraction],
);
diff --git a/packages/loot-core/src/client/actions/prefs.ts b/packages/loot-core/src/client/actions/prefs.ts
index cc690f2152..21cd7a5d55 100644
--- a/packages/loot-core/src/client/actions/prefs.ts
+++ b/packages/loot-core/src/client/actions/prefs.ts
@@ -1,4 +1,5 @@
import { send } from '../../platform/client/fetch';
+import { parseNumberFormat, setNumberFormat } from '../../shared/util';
import {
type GlobalPrefs,
type MetadataPrefs,
@@ -19,13 +20,26 @@ export function loadPrefs() {
dispatch(closeModal());
}
+ const [globalPrefs, syncedPrefs] = await Promise.all([
+ send('load-global-prefs'),
+ send('preferences/get'),
+ ]);
+
dispatch({
type: constants.SET_PREFS,
prefs,
- globalPrefs: await send('load-global-prefs'),
- syncedPrefs: await send('preferences/get'),
+ globalPrefs,
+ syncedPrefs,
});
+ // Certain loot-core utils depend on state outside of the React tree, update them
+ setNumberFormat(
+ parseNumberFormat({
+ format: syncedPrefs.numberFormat,
+ hideFraction: syncedPrefs.hideFraction,
+ }),
+ );
+
return prefs;
};
}
diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.ts
index 2dec806cc8..92ea4e4b4a 100644
--- a/packages/loot-core/src/shared/util.ts
+++ b/packages/loot-core/src/shared/util.ts
@@ -235,7 +235,7 @@ const NUMBER_FORMATS = [
type NumberFormats = (typeof NUMBER_FORMATS)[number];
-export function isNumberFormat(input: string = ''): input is NumberFormats {
+function isNumberFormat(input: string = ''): input is NumberFormats {
return (NUMBER_FORMATS as readonly string[]).includes(input);
}
@@ -259,6 +259,19 @@ let numberFormatConfig: {
hideFraction: false,
};
+export function parseNumberFormat({
+ format,
+ hideFraction,
+}: {
+ format?: string;
+ hideFraction?: string | boolean;
+}) {
+ return {
+ format: isNumberFormat(format) ? format : 'comma-dot',
+ hideFraction: String(hideFraction) === 'true',
+ };
+}
+
export function setNumberFormat(config: typeof numberFormatConfig) {
numberFormatConfig = config;
}
diff --git a/upcoming-release-notes/4038.md b/upcoming-release-notes/4038.md
new file mode 100644
index 0000000000..68b1b664c2
--- /dev/null
+++ b/upcoming-release-notes/4038.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix loading of number format preferences at app startup