Skip to content

Commit

Permalink
fix: fix merging of settings state in settings context (#711)
Browse files Browse the repository at this point in the history
  • Loading branch information
achou11 authored Aug 23, 2021
1 parent 6c59277 commit 6314d6c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/frontend/context/SettingsContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const SettingsProvider = ({ children }: { children: React.Node }) => {
const contextValue: SettingsContextType = React.useMemo(() => {
// If we add any new properties to the settings state, they will be
// undefined in a users' persisted state, so we merge in the defaults
const mergedState = merge({}, state, DEFAULT_SETTINGS);
const mergedState = merge({}, DEFAULT_SETTINGS, state);
return [mergedState, setSettings];
}, [state, setSettings]);

Expand Down

0 comments on commit 6314d6c

Please sign in to comment.