Skip to content

Commit 21ac1a7

Browse files
committed
fix: settings not loading
1 parent 8f32118 commit 21ac1a7

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

src/context/global-context.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,22 +154,27 @@ export const GlobalContextProvider: React.FC<GlobalContextProps> = ({ children }
154154
});
155155
const [projects, setProjects] = useState<string[]>([]);
156156
const [searchTerm, setSearchTerm] = useState("");
157-
const [settings, setSettings] = useState<ExtendedSettings>({
158-
...DEFAULT_SETTINGS,
159-
projects: []
160-
});
161-
162157
// Storage Manager Instance
163158
const storageManager = useMemo(() => StorageManager.getInstance(), []);
164159

160+
// Initialize settings with localStorage data immediately
161+
const [settings, setSettings] = useState<ExtendedSettings>(() => {
162+
try {
163+
const data = storageManager.getData();
164+
if (data.settings) {
165+
return { ...DEFAULT_SETTINGS, projects: [], ...data.settings };
166+
}
167+
return { ...DEFAULT_SETTINGS, projects: [] };
168+
} catch (error) {
169+
console.error('Failed to initialize settings:', error);
170+
return { ...DEFAULT_SETTINGS, projects: [] };
171+
}
172+
});
173+
165174
// Initialize data from localStorage
166175
useEffect(() => {
167176
const data = storageManager.getData();
168177

169-
if (data.settings) {
170-
setSettings(prev => ({ ...prev, ...data.settings }));
171-
}
172-
173178
if (data.cookies) {
174179
setCookiesState(sortByOrder(data.cookies));
175180
}

0 commit comments

Comments
 (0)