Skip to content

A local-first personal finance app

Remove isGlobal preference functionality (#6049)

Matiss Janis Aboltins0cac66b203c6
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index 618767f0c5..c18ddbc1c1 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -83,7 +83,7 @@ function GlobalFeatureToggle({
error,
children,
}: GlobalFeatureToggleProps) {
- const [enabled, setEnabled] = useSyncedPref(prefName, { isGlobal: true });
+ const [enabled, setEnabled] = useSyncedPref(prefName);
return (
<label style={{ display: 'flex' }}>
diff --git a/packages/desktop-client/src/hooks/useSyncedPref.ts b/packages/desktop-client/src/hooks/useSyncedPref.ts
index d314d41015..ed91af47f1 100644
--- a/packages/desktop-client/src/hooks/useSyncedPref.ts
+++ b/packages/desktop-client/src/hooks/useSyncedPref.ts
@@ -11,7 +11,6 @@ type SetSyncedPrefAction<K extends keyof SyncedPrefs> = (
export function useSyncedPref<K extends keyof SyncedPrefs>(
prefName: K,
- options?: { isGlobal?: boolean },
): [SyncedPrefs[K], SetSyncedPrefAction<K>] {
const dispatch = useDispatch();
const setPref = useCallback<SetSyncedPrefAction<K>>(
@@ -19,11 +18,10 @@ export function useSyncedPref<K extends keyof SyncedPrefs>(
dispatch(
saveSyncedPrefs({
prefs: { [prefName]: value },
- isGlobal: options?.isGlobal,
}),
);
},
- [prefName, dispatch, options?.isGlobal],
+ [prefName, dispatch],
);
const pref = useSelector(state => state.prefs.synced[prefName]);
diff --git a/packages/desktop-client/src/prefs/prefsSlice.ts b/packages/desktop-client/src/prefs/prefsSlice.ts
index 69bdca4d22..b5e8dc17a5 100644
--- a/packages/desktop-client/src/prefs/prefsSlice.ts
+++ b/packages/desktop-client/src/prefs/prefsSlice.ts
@@ -108,18 +108,16 @@ export const saveGlobalPrefs = createAppAsyncThunk(
type SaveSyncedPrefsPayload = {
prefs: SyncedPrefs;
- isGlobal?: boolean;
};
export const saveSyncedPrefs = createAppAsyncThunk(
`${sliceName}/saveSyncedPrefs`,
- async ({ prefs, isGlobal }: SaveSyncedPrefsPayload, { dispatch }) => {
+ async ({ prefs }: SaveSyncedPrefsPayload, { dispatch }) => {
await Promise.all(
Object.entries(prefs).map(([prefName, value]) =>
send('preferences/save', {
id: prefName as keyof SyncedPrefs,
value,
- isGlobal,
}),
),
);
diff --git a/packages/loot-core/migrations/1759842823172_add_isGlobal_to_preferences.sql b/packages/loot-core/migrations/1759842823172_add_isGlobal_to_preferences.sql
index 84821fee39..564b68282a 100644
--- a/packages/loot-core/migrations/1759842823172_add_isGlobal_to_preferences.sql
+++ b/packages/loot-core/migrations/1759842823172_add_isGlobal_to_preferences.sql
@@ -1,8 +1 @@
--- Migration: Add isGlobal column to preferences table
-BEGIN TRANSACTION;
-
-ALTER TABLE preferences ADD COLUMN isGlobal INTEGER DEFAULT 0;
-
-COMMIT;
-
-
+-- Migration removed because it was not needed
diff --git a/packages/loot-core/src/server/db/types/index.ts b/packages/loot-core/src/server/db/types/index.ts
index 5f8dcd731b..00afc6ef50 100644
--- a/packages/loot-core/src/server/db/types/index.ts
+++ b/packages/loot-core/src/server/db/types/index.ts
@@ -212,7 +212,6 @@ export type DbTransactionFilter = {
export type DbPreference = {
id: string;
value: string;
- isGlobal?: 1 | 0;
};
export type DbCustomReport = {
diff --git a/packages/loot-core/src/server/preferences/app.ts b/packages/loot-core/src/server/preferences/app.ts
index 0a7ea1d69e..6030fe25b3 100644
--- a/packages/loot-core/src/server/preferences/app.ts
+++ b/packages/loot-core/src/server/preferences/app.ts
@@ -39,11 +39,9 @@ app.method('load-prefs', loadMetadataPrefs);
async function saveSyncedPrefs({
id,
value,
- isGlobal,
}: {
id: keyof SyncedPrefs;
value: string | undefined;
- isGlobal?: boolean;
}) {
if (!id) {
return;
@@ -52,7 +50,6 @@ async function saveSyncedPrefs({
await db.update('preferences', {
id,
value,
- ...(isGlobal !== undefined && { isGlobal: isGlobal ? 1 : 0 }),
});
}
diff --git a/upcoming-release-notes/6049.md b/upcoming-release-notes/6049.md
new file mode 100644
index 0000000000..a2bcc89d40
--- /dev/null
+++ b/upcoming-release-notes/6049.md
@@ -0,0 +1,7 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Remove `isGlobal` preference functionality from the preferences and synced preferences system.
+