Skip to content

Commit e1815b7

Browse files
authored
fix: settings improperly displaying (#106)
1 parent 68c90d7 commit e1815b7

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "halo-discord-extension",
3-
"version": "2.2.0",
3+
"version": "2.2.1",
44
"description": "Receive Discord notifications for updates in Halo",
55
"author": "Elijah Olmos",
66
"license": "AGPL-3.0-only",

src/popup/Settings.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// settings
5252
default_settings = await getDefaultSettings();
5353
//apply default settings to user_settings
54-
user_settings = Object.values(default_settings).reduce(
54+
user_settings = default_settings.reduce(
5555
(acc, { id, value }) => (!!acc.hasOwnProperty(id) ? acc : { ...acc, [id]: value }),
5656
await getUserSettings()
5757
);

src/util/auth.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ export const getDefaultSettings = async function () {
8484
try {
8585
console.log('getDefaultSettings');
8686
const settings = await get(ref(db, 'default_settings'));
87-
return settings.exists() ? settings.val() : {};
87+
return settings.exists() ? Object.values(settings.val()) : [];
8888
} catch (e) {
8989
console.error('getUserSettings error', e);
90-
return {};
90+
return [];
9191
}
9292
};
9393

0 commit comments

Comments
 (0)