fix: return default from hook instead of api

Author: artemmufazalov

src/store/reducers/settings/api.ts

@@ -8,33 +8,27 @@ import {serializeError} from '../../utils';
 import {api} from '../api';
 
 import {SETTINGS_OPTIONS} from './constants';
-import {getSettingDefault, parseSettingValue, stringifySettingValue} from './utils';
+import {parseSettingValue, stringifySettingValue} from './utils';
 
 export const settingsApi = api.injectEndpoints({
     endpoints: (builder) => ({
         getSingleSetting: builder.query<unknown, Partial<GetSingleSettingParams>>({
             queryFn: async ({name, user}) => {
                 try {
-                    if (!name || !window.api?.metaSettings) {
+                    if (!name || !user || !window.api?.metaSettings) {
                         throw new Error(
                             'Cannot get setting, no MetaSettings API or necessary params are missing',
                         );
                     }
 
-                    const defaultValue = getSettingDefault(name) as unknown;
-
-                    if (!user) {
-                        return {data: defaultValue};
-                    }
-
                     const data = await window.api.metaSettings.getSingleSetting({
                         name,
                         user,
                         // Directly access options here to avoid them in cache key
                         preventBatching: SETTINGS_OPTIONS[name]?.preventBatching,
                     });
 
-                    return {data: parseSettingValue(data?.value) ?? defaultValue};
+                    return {data: parseSettingValue(data?.value)};
                 } catch (error) {
                     return {error: serializeError(error)};
                 }
@@ -97,14 +91,11 @@ export const settingsApi = api.injectEndpoints({
                     name.forEach((settingName) => {
                         const settingData = data[settingName];
 
-                        const defaultValue = getSettingDefault(settingName);
-
                         const cacheEntryParams: GetSingleSettingParams = {
                             name: settingName,
                             user,
                         };
-                        const newSettingValue =
-                            parseSettingValue(settingData?.value) ?? defaultValue;
+                        const newSettingValue = parseSettingValue(settingData?.value);
 
                         const patch = dispatch(
                             settingsApi.util.upsertQueryData(

src/store/reducers/settings/useSetting.ts

@@ -7,6 +7,7 @@ import {useTypedSelector} from '../../../utils/hooks/useTypedSelector';
 import {selectMetaUser} from '../authentication/authentication';
 
 import {settingsApi} from './api';
+import {getSettingDefault} from './utils';
 
 type SaveSettingValue<T> = (value: T | undefined) => void;
 
@@ -30,10 +31,16 @@ export function useSetting<T>(name?: string): {
         if (!name) {
             return undefined;
         }
+        const defaultValue = getSettingDefault(name) as unknown;
+
+        let value;
+
         if (window.api?.metaSettings) {
-            return settingFromMeta;
+            value = settingFromMeta;
+        } else {
+            value = settingFromLS;
         }
-        return settingFromLS;
+        return value ?? defaultValue;
     }, [name, settingFromMeta, settingFromLS]);
 
     const saveValue = React.useCallback<SaveSettingValue<T>>(