fix: settings improperly displaying (#106)

elijaholmos · Dec 7, 2022 · e1815b7 · e1815b7
1 parent 68c90d7
commit e1815b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "halo-discord-extension",
-	"version": "2.2.0",
+	"version": "2.2.1",
 	"description": "Receive Discord notifications for updates in Halo",
 	"author": "Elijah Olmos",
 	"license": "AGPL-3.0-only",

diff --git a/src/popup/Settings.svelte b/src/popup/Settings.svelte
@@ -51,7 +51,7 @@
 		// settings
 		default_settings = await getDefaultSettings();
 		//apply default settings to user_settings
-		user_settings = Object.values(default_settings).reduce(
+		user_settings = default_settings.reduce(
 			(acc, { id, value }) => (!!acc.hasOwnProperty(id) ? acc : { ...acc, [id]: value }),
 			await getUserSettings()
 		);

diff --git a/src/util/auth.js b/src/util/auth.js
@@ -84,10 +84,10 @@ export const getDefaultSettings = async function () {
 	try {
 		console.log('getDefaultSettings');
 		const settings = await get(ref(db, 'default_settings'));
-		return settings.exists() ? settings.val() : {};
+		return settings.exists() ? Object.values(settings.val()) : [];
 	} catch (e) {
 		console.error('getUserSettings error', e);
-		return {};
+		return [];
 	}
 };